Move terminology modules into terminology module.

Author: zgypa

Makefile

@@ -7,7 +7,7 @@ dist:
 
 build:
 	mkdir -p build
-	python3 -m $(NAME).save_codes
+	python3 -m $(NAME).main
 
 deploy: dist
 	twine upload dist/*

ortho_codes/__init__.py

@@ -1,17 +0,0 @@
-import json
-
-class Code:
-    def __init__(self, system, code, display, synonyms = []):
-        self.system = system
-        self.code = code
-        self.display = display
-        self.synonyms = synonyms
-
-    def to_json(self):
-        return json.dumps({
-            'system': self.system,
-            'code': self.code,
-            'display': self.display,
-            'synonyms': self.synonyms
-        }, indent=4)
-

ortho_codes/save_codes.py renamed to ortho_codes/main.py

@@ -9,32 +9,39 @@
 import json
 import csv
 from pathlib import Path
-from . import Code, snomed, hl7, vendors
+
+from ortho_codes.terminology import hl7, open_ortho, snomed, vendors
+from ortho_codes.terminology import Code
+
 
 build_path = Path('.', 'build')
 
+
 def save_to_json(data, filename):
     with open(filename, 'w') as f:
         json.dump(data, f, indent=4)
 
+
 def save_to_csv(data, filename):
     with open(filename, 'w', newline='') as f:
         writer = csv.writer(f)
         writer.writerow(['Key', 'System', 'Code', 'Display'])
         for key, value in data.items():
-            writer.writerow([key, value['system'], value['code'], value['display']])
+            writer.writerow(
+                [key, value['system'], value['code'], value['display']])
+
 
 def module_to_dict(module):
     Codes = {name: getattr(module, name) for name in dir(module)
              if isinstance(getattr(module, name), Code)}
 
     # Convert Code instances to dictionaries for JSON and CSV
     return {name: {'system': code.system, 'code': code.code, 'display': code.display}
-                  for name, code in Codes.items()}
+            for name, code in Codes.items()}
 
 
 if __name__ == "__main__":
-    for module in (snomed, hl7, vendors):
+    for module in (snomed, hl7, vendors, open_ortho):
         dict_module = module_to_dict(module)
         save_to_json(dict_module, build_path / f'{module.__name__}.json')
         save_to_csv(dict_module, build_path / f'{module.__name__}.csv')

ortho_codes/terminology/__init__.py

@@ -0,0 +1,17 @@
+import json
+
+class Code:
+    def __init__(self, system, code, display, synonyms = []):
+        self.system = system
+        self.code = code
+        self.display = display
+        self.synonyms = synonyms
+
+    def to_json(self):
+        return json.dumps({
+            'system': self.system,
+            'code': self.code,
+            'display': self.display,
+            'synonyms': self.synonyms
+        }, indent=4)
+

ortho_codes/hl7.py renamed to ortho_codes/terminology/hl7.py

@@ -3,6 +3,7 @@
 Used whenever a code is necessary, for various implementations.
 """
 from . import Code
+PREFIX = 'OPOR'
 
 def make_code(s):
     """
@@ -19,11 +20,12 @@ def make_code(s):
 
 class NAMESPACES:
     root_uid = "1.3.6.1.4.1.61741.11.3"
-    url =  "http://open-ortho.org/codes"
+    url =  "http://open-ortho.org/terminology"
 
 IV01 = Code(
     system=NAMESPACES.url,
     code=f"{NAMESPACES.root_uid}.{make_code('IV01')}",
     display='Intraoral Right Buccal Segment, Centric Occlusion, Direct View',
     synonyms=[''])
 """ Used for ... """
+

ortho_codes/open_ortho.py renamed to ortho_codes/terminology/open_ortho.py

@@ -5,40 +5,41 @@
 """
 from . import Code
 
-class NAMESPACES:
-    snomedct = "http://snomed.info/sct"
+PREFIX = "SCT"
+SYSTEM = "http://snomed.info/sct"
 
-dental_chair = Code(
-    system=NAMESPACES.snomedct,
+class CodeSnomed(Code):
+
+    def __init__(self,**kwargs):
+        self.prefix = PREFIX
+        self.system = SYSTEM
+        self.code = kwargs.get('code')
+        self.display = kwargs.get('display')
+
+dental_chair = CodeSnomed(
     code='706356006',
     display='Dental examination/treatment chair')
 
-orthod_treatment_perm_class1 = Code(
-    system=NAMESPACES.snomedct,
+orthod_treatment_perm_class1 = CodeSnomed(
     code='3891000',
     display='Comprehensive orthodontic treatment, permanent dentition, for class I malocclusion')
 
-ortho_treatment = Code(
-    system=NAMESPACES.snomedct,
+ortho_treatment = CodeSnomed(
     code='122452007',
     display='Comprehensive orthodontic treatment')
 
-orthodontist = Code(
-    system=NAMESPACES.snomedct,
+orthodontist = CodeSnomed(
     code='37504001',
     display='Orthodontist')
 
-clinical_staff = Code(
-    system=NAMESPACES.snomedct,
+clinical_staff = CodeSnomed(
     code='4162009',
     display='Dental assistant')
 
-admin_staff = Code(
-    system=NAMESPACES.snomedct,
+admin_staff = CodeSnomed(
     code='224608005',
     display='Administrative healthcare staff')
 
-tech_support = Code(
-    system=NAMESPACES.snomedct,
+tech_support = CodeSnomed(
     code='159324001',
     display='Technical assistant')

ortho_codes/snomed.py renamed to ortho_codes/terminology/snomed.py

@@ -4,4 +4,4 @@
 
 class NAMESPACES:
     topsortho = "http://topsortho.com/topsdb"
-    open_ortho = "http://open-ortho.org/codes"
+    open_ortho = "http://open-ortho.org/terminology"

ortho_codes/vendors.py renamed to ortho_codes/terminology/vendors.py

@@ -31,7 +31,7 @@
     # package_data={'yourpackage': ['data/*.dat']},  # Include specific package data
     entry_points={  # Allows you to create command-line scripts
         'console_scripts': [
-            'oo-codes=ortho_codes.save_codes:main', 
+            'oo-codes=ortho_codes.main:main', 
         ],
     },
 )