endoreg-db 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

endoreg_db/data/__init__.py

@@ -52,6 +52,9 @@ CASE_TEMPLATE_RULE_TYPE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_type"
 CASE_TEMPLATE_RULE_VALUE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_value"
 CASE_TEMPLATE_RULE_VALUE_TYPE_DATA_DIR = CASE_TEMPLATE_BASE_DIR / "rule_value_type"
 
+# NETWORK
+NETWORK_DEVICE_DATA_DIR = DATA_DIR / "network_device"
+NETWORK_DEVICE_TYPE_DATA_DIR = DATA_DIR / "network_device_type"
 
 # To Do
 LAB_VALUE_DATA_DIR = DATA_DIR / "lab_value"

endoreg_db/data/network_device/data.yaml

@@ -0,0 +1,17 @@
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-01"
+    device_type: "agl-server"
+    ip_address: "172.16.255.1"
+
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-03"
+    device_type: "agl-server"
+    ip_address: "172.16.255.3"
+
+- model: endoreg_db.network_device
+  fields:
+    name: "agl-server-04"
+    device_type: "agl-server"
+    ip_address: "172.16.255.4"

endoreg_db/data/network_device_type/data.yaml

@@ -0,0 +1,8 @@
+- model: endoreg_db.network_device_type
+  fields:
+    name: "agl-server"
+
+
+- model: endoreg_db.network_device_type
+  fields:
+    name: "coloreg-client"

endoreg_db/management/commands/load_base_db_data.py

@@ -16,6 +16,10 @@ class Command(BaseCommand):
 
         self.stdout.write(self.style.SUCCESS("Populating base db models with data..."))
 
+        # Run the load_network_data command
+        self.stdout.write(self.style.SUCCESS("Running load_network_data..."))
+        call_command('load_network_data', verbose=verbose)
+
         # Run the load_profession_data command
         self.stdout.write(self.style.SUCCESS("Running load_profession_data..."))
         call_command('load_profession_data', verbose=verbose)

endoreg_db/management/commands/load_network_data.py

@@ -0,0 +1,49 @@
+from django.core.management.base import BaseCommand
+from endoreg_db.models import NetworkDevice, NetworkDeviceType
+from ...utils import load_model_data_from_yaml
+from ...data import NETWORK_DEVICE_DATA_DIR, NETWORK_DEVICE_TYPE_DATA_DIR
+
+MODEL_0 = NetworkDeviceType
+MODEL_1 = NetworkDevice
+
+IMPORT_MODELS = [ # string as model key, serves as key in IMPORT_METADATA
+    MODEL_0.__name__,
+    MODEL_1.__name__
+]
+
+IMPORT_METADATA = {
+    MODEL_0.__name__: {
+        "dir": NETWORK_DEVICE_TYPE_DATA_DIR, # e.g. "interventions"
+        "model": MODEL_0, # e.g. Intervention
+        "foreign_keys": [], # e.g. ["intervention_types"]
+        "foreign_key_models": [] # e.g. [InterventionType]
+    },
+    MODEL_1.__name__: {
+        "dir": NETWORK_DEVICE_DATA_DIR, # e.g. "interventions"
+        "model": MODEL_1, # e.g. Intervention
+        "foreign_keys": ["device_type"], # e.g. ["intervention_types"]
+        "foreign_key_models": [NetworkDeviceType] # e.g. [InterventionType]
+    }
+}
+
+class Command(BaseCommand):
+    help = """Load all .yaml files in the data/intervention directory
+    into the Intervention and InterventionType model"""
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--verbose',
+            action='store_true',
+            help='Display verbose output',
+        )
+
+    def handle(self, *args, **options):
+        verbose = options['verbose']
+        for model_name in IMPORT_MODELS:
+            _metadata = IMPORT_METADATA[model_name]
+            load_model_data_from_yaml(
+                self,
+                model_name,
+                _metadata,
+                verbose
+            )

endoreg_db/models/__init__.py

@@ -4,6 +4,7 @@ from .center import *
 from .report_reader import ReportReaderConfig, ReportReaderFlag
 from .emission import *
 from .persons import *
+from .network import *
 
 from .case_template import *
 # from .other.distribution import (

endoreg_db/models/network/__init__.py

@@ -0,0 +1,2 @@
+from .network_device import NetworkDevice
+from .network_device_type import NetworkDeviceType

endoreg_db/models/network/network_device.py

@@ -0,0 +1,27 @@
+# Django db class to store network devices (e.g., servers, clients, switches, etc.)
+
+from django.db import models
+
+class NetworkDeviceManager(models.Manager):
+    # Custom manager for NetworkDevice; defines name as natural key
+    def get_by_natural_key(self, name):
+        return self.get(name=name)
+    
+class NetworkDevice(models.Model):
+    name = models.CharField(max_length=255)
+    ip = models.GenericIPAddressField(blank=True, null=True)
+    description = models.CharField(max_length=255)
+    device_type = models.ForeignKey("NetworkDeviceType", on_delete=models.CASCADE)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+    objects = NetworkDeviceManager()
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        db_table = 'network_devices'
+        ordering = ['name']
+        
+    def natural_key(self):
+        return (self.name,)

endoreg_db/models/network/network_device_type.py

@@ -0,0 +1,23 @@
+# Django db class to store network device types (e.g., server, client, switch, etc.)
+
+from django.db import models
+
+class NetworkDeviceTypeManager(models.Model):
+    # Custom manager for NetworkDeviceType; defines name as natural key
+    def get_by_natural_key(self, name):
+        return self.get(name=name)
+
+class NetworkDeviceType(models.Model):
+    name = models.CharField(max_length=255)
+    description = models.CharField(max_length=255)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
+    objects = NetworkDeviceTypeManager()
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        db_table = 'network_device_types'
+        ordering = ['name']
+

{endoreg_db-0.3.5.dist-info → endoreg_db-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: endoreg-db
-Version: 0.3.5
+Version: 0.3.7
 Summary: EndoReg Db Django App
 License: GNU3
 Author: Thomas J. Lux

{endoreg_db-0.3.5.dist-info → endoreg_db-0.3.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 endoreg_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 endoreg_db/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 endoreg_db/apps.py,sha256=zYb2_RiEGIsLS6_OMWzCxcTHSNkF28CqF4xcd_6NHUg,151
-endoreg_db/data/__init__.py,sha256=HAoWjIVw8aO_lgArCZwXRr0Llt1is4JzPurJEy_FTCA,2994
+endoreg_db/data/__init__.py,sha256=OAsZAYQQOEpVIo9NCZJ9D8c0w1AhInBfPeCQ0lvVEoE,3122
 endoreg_db/data/active_model/data.yaml,sha256=G7PvKmGDm_Gt6Tzf99s18b5vlE5qWruvClzlcINqDQE,86
 endoreg_db/data/case_template/rule/00_patient_lab_sample_add_default_value.yaml,sha256=H3kTALJ_6GJrY-4EYemeTCaa81NkyI-8LcNJFuEp5zs,4100
 endoreg_db/data/case_template/rule/01_patient-set-age.yaml,sha256=lXfgKtirkQMHfAQtp9y9mojNnYx2KskGvdK-C1GEmtc,281
@@ -68,6 +68,8 @@ endoreg_db/data/medication_schedule/apixaban.yaml,sha256=TjmoBu4ian9ZwiSN5qBKtiv
 endoreg_db/data/medication_schedule/ass.yaml,sha256=ECiHbQcahbZP9B8IDOYRB6vHKj3yl7cBY9QasIHJ7sM,295
 endoreg_db/data/medication_schedule/enoxaparin.yaml,sha256=lI8WfFBspEXhTxnTEfyq1a_VBKbdNAcj34PIF2_X3cQ,653
 endoreg_db/data/model_type/data.yaml,sha256=vCMMo8wiI5uL2zrQROmgsHq1GrC8IdagGIgNdQunUeQ,149
+endoreg_db/data/network_device/data.yaml,sha256=dm1zxeDzBJ6JKrk9Si0_3ZvlH0U4He_A6-EBix2Yl1o,397
+endoreg_db/data/network_device_type/data.yaml,sha256=a052EXWgo3m_8DrzJ4tYGUybc8qC6xdRCBgswiSK38M,152
 endoreg_db/data/patient_lab_sample_type/generic.yaml,sha256=nbtummOrGUeBkM7sVpqq48txkC-bmxn4_h40oS4VloY,162
 endoreg_db/data/pdf_type/data.yaml,sha256=0eMCb3-j2_zY0NkyIFFM7H9658kILpd5mt_OgrXxs64,990
 endoreg_db/data/product/green_endoscopy_dashboard_Product.yaml,sha256=PzQGTSXJ-UwtXkOGdI0nsGGDo0HO1KwZKpCfiEqmdt0,1898
@@ -107,7 +109,7 @@ endoreg_db/management/commands/import_legacy_images.py,sha256=IcBmihG9rvqC37XgMg
 endoreg_db/management/commands/import_legacy_videos.py,sha256=OHFTNb53RtznRyVay88vo83fkfafTiwTgUMieI70NX4,2732
 endoreg_db/management/commands/load_active_model_data.py,sha256=NpWIksrVQIyrd-ZhI_B_34NFbLJI1_vhwuN6gXc8hgQ,1337
 endoreg_db/management/commands/load_ai_model_data.py,sha256=rjC-yK8NNr0a0TDqvGHufI27ANQYTWDkWlSEWRkubGY,1329
-endoreg_db/management/commands/load_base_db_data.py,sha256=bhL9q2FDdYQQ25ZdEiYvl7McLq8Bzu3h2dyC7z9LGF0,6111
+endoreg_db/management/commands/load_base_db_data.py,sha256=xewHewt_4OMunmEX-yntX2EFfd5bGSBhAWKVdqNzMcY,6293
 endoreg_db/management/commands/load_center_data.py,sha256=Ra7BikibHJF4Ks72WNGwJqtbIw-9MieCxKlZG_RUA-s,1339
 endoreg_db/management/commands/load_disease_classification_choices_data.py,sha256=zSwNVmI56myFtOBUxV9kD_-4NKh0Z4nWuvFN3RSSulU,1361
 endoreg_db/management/commands/load_disease_classification_data.py,sha256=B0sIgDq35e8Js3cqBCpRBoDuKRoDy7YvPbaZ4jjJS2I,1305
@@ -128,6 +130,7 @@ endoreg_db/management/commands/load_medication_indication_data.py,sha256=lR3zJdT
 endoreg_db/management/commands/load_medication_indication_type_data.py,sha256=CJ3zyFv7DnTuhBfG6TAdU9uZ0c2aHd31Y33g3X-SYVA,1282
 endoreg_db/management/commands/load_medication_intake_time_data.py,sha256=Qln3plozYsADcS0gKLdnLzAjbVLxC6N9h3ja-pS5CiI,1270
 endoreg_db/management/commands/load_medication_schedule_data.py,sha256=UTnCGF2gFUsdDb76cYrntaHGFazz4tUWg9ulF8bOVKY,1514
+endoreg_db/management/commands/load_network_data.py,sha256=JMusB-hPmuhuHbaIyg2tJ95yTfuJwTbf9MIUUqHD6aE,1637
 endoreg_db/management/commands/load_pdf_type_data.py,sha256=sJeGI1M4Xwkagi7rModwUJH3MuQckZXdOkHekoAvRAw,1650
 endoreg_db/management/commands/load_profession_data.py,sha256=oF3OF7zRqxA-SVpMW6e7LJ3MSfEc5Hoz1XlcvcFACRg,1321
 endoreg_db/management/commands/load_report_reader_flag.py,sha256=pvqRgtcjaYTgx2Ce7HYnNzsUB48yJe9lXTk-lzfJUPI,1371
@@ -203,7 +206,7 @@ endoreg_db/migrations/0065_rename__date_value_distribution_casetemplaterule_date
 endoreg_db/migrations/0066_alter_patientlabvalue_patient_and_more.py,sha256=XEn9XBxJhh0mNDj8htiLUcViyGMLOkew2UmbbMExeC4,1240
 endoreg_db/migrations/0067_alter_medicationindication_indication_type.py,sha256=HcMRzp-G1bOl2y_aKTU1GMk85bX1sTO-XMeLNG4MzmE,577
 endoreg_db/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-endoreg_db/models/__init__.py,sha256=CL_Ea13ebAp9-q9wBjsAojFvF0tDr7qtNA5z7tJI9q0,1506
+endoreg_db/models/__init__.py,sha256=o0z5ORbMweAR15gSHRkXJzScj7Fr8SLXUoZ2J-p660k,1529
 endoreg_db/models/ai_model/__init__.py,sha256=rh5npLRGml5iiRocx359gsaA82pGJTW7wdVAfnbZP6w,106
 endoreg_db/models/ai_model/active_model.py,sha256=r7SE3yg54kbjfOkk0Ei0rgs_Wo3ikx88rcEELqvRzGc,343
 endoreg_db/models/ai_model/model_meta.py,sha256=YyYW8dScpAceHePnbrnRpgVBYDByi9x7u5Ydh03OJuo,869
@@ -263,6 +266,9 @@ endoreg_db/models/legacy_data/__init__.py,sha256=J0ewe30Y2qCxCUPktcFOm2WOEz2fQnw
 endoreg_db/models/legacy_data/image.py,sha256=mKQed6AIJL2XauPB2GevHX6NXaR8gphundI9_IC9Hpc,1622
 endoreg_db/models/medication/__init__.py,sha256=69K9Iy3zEqJSd0zS_ZS9WKbvGQIgmOJm1PCpPI_vwOg,25
 endoreg_db/models/medication/medication.py,sha256=tPXBnrGVkmyvfhjJQGcD4Jq2TkYeHl8nNLvGuVisBiI,4939
+endoreg_db/models/network/__init__.py,sha256=RjhUS0qXDvcAwrszx2nG_C9fXKO43q1jQZIM1tY6j90,92
+endoreg_db/models/network/network_device.py,sha256=s_zuLMSwu-6mpwxS7Gc0P9wSih_HzJtMWHW4hkjH5Vg,916
+endoreg_db/models/network/network_device_type.py,sha256=8cWAutupItIvXM8E8YWmHuR0YNxZXnFS67IG7hCGQNw,726
 endoreg_db/models/other/__init__.py,sha256=HDlNBuS98uIvxpw3sww-hiyulG871TzulFRrLO0C8ec,158
 endoreg_db/models/other/distribution.py,sha256=OLMELIpP9xQa4BkiLZoBbEoxzLmOponZh_LYro6g4DM,8404
 endoreg_db/models/other/material.py,sha256=5C09hUD-cQL8vCRFNPyq2OyRHjFwCA5nCwW4Zh16Ak0,520
@@ -351,7 +357,7 @@ endoreg_db/utils/ocr.py,sha256=jkdT1bl-LSCjZ2PvxlX1AG2TmhdMclayxUPrdZWs7UE,7322
 endoreg_db/utils/uuid.py,sha256=T4HXqYtKwXFqE5kPyvlgWHyllBBF6LL6N48nl9TpwBk,53
 endoreg_db/utils/video_metadata.py,sha256=HDyXxAeNQOK3cGzQ06xosmObzEnJBARuKjwz9vmmRIM,2613
 endoreg_db/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
-endoreg_db-0.3.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-endoreg_db-0.3.5.dist-info/METADATA,sha256=5ET-SK-6xp6iQzORaPywFb_ZdL0kTYvCb46NU8nsZA0,976
-endoreg_db-0.3.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-endoreg_db-0.3.5.dist-info/RECORD,,
+endoreg_db-0.3.7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+endoreg_db-0.3.7.dist-info/METADATA,sha256=yaBTmBrl60vf7SiwpixdGiRMzky3lD_hV-RHzzPQDNI,976
+endoreg_db-0.3.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+endoreg_db-0.3.7.dist-info/RECORD,,