reorganize to move datamodel for Node into the correct file

Author: tipatterson-dev

oshconnect/__init__.py

@@ -8,12 +8,14 @@
 import base64
 import uuid
 from abc import ABC
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum
 import swecommondm as swe_common
 from conSys4Py import APIResourceTypes
 from conSys4Py.core.default_api_helpers import APIHelper
 
+from external_models.object_models import System as SystemResource
+
 
 @dataclass(kw_only=True)
 class Endpoints:
@@ -22,55 +24,6 @@ class Endpoints:
     connected_systems: str = f"{root}/api"
 
 
-@dataclass(kw_only=True)
-class Node:
-    _id: str
-    address: str
-    port: int
-    endpoints: Endpoints
-    is_secure: bool
-    _basic_auth: bytes = None
-    _api_helper: APIHelper
-
-    def __init__(self, address: str, port: int, username: str = None, password: str = None, **kwargs: dict):
-        self._id = f'node-{uuid.uuid4()}'
-        self.address = address
-        self.port = port
-        self.is_secure = username is not None and password is not None
-        if self.is_secure:
-            self.add_basicauth(username, password)
-        self.endpoints = Endpoints()
-        self._api_helper = APIHelper(server_url=f'{self.address}:{self.port}',
-                                     api_root=self.endpoints.connected_systems, username=username, password=password)
-        if self.is_secure:
-            self._api_helper.user_auth = True
-
-    def get_id(self):
-        return self._id
-
-    def get_address(self):
-        return self.address
-
-    def get_port(self):
-        return self.port
-
-    def get_api_endpoint(self):
-        return f"http{'s' if self.is_secure else ''}://{self.address}:{self.port}/{self.endpoints.connected_systems}"
-
-    def add_basicauth(self, username: str, password: str):
-        if not self.is_secure:
-            self.is_secure = True
-        self._basic_auth = base64.b64encode(f"{username}:{password}".encode('utf-8'))
-
-    def get_decoded_auth(self):
-        return self._basic_auth.decode('utf-8')
-
-    def discover_systems(self):
-        res = self._api_helper.retrieve_resource(APIResourceTypes.SYSTEM, req_headers={})
-        if res.ok:
-            return res.json()
-        else:
-            return None
 
 
 class TemporalModes(Enum):

oshconnect/datamodels/datamodels.py

@@ -6,10 +6,81 @@
 #   ==============================================================================
 from __future__ import annotations
 
+import base64
 import uuid
+from dataclasses import dataclass, field
+
+from conSys4Py import APIResourceTypes
+from conSys4Py.core.default_api_helpers import APIHelper
 
-from oshconnect import Node
 from external_models.object_models import System as SystemResource
+from oshconnect import Endpoints
+
+
+@dataclass(kw_only=True)
+class Node:
+    _id: str
+    address: str
+    port: int
+    endpoints: Endpoints
+    is_secure: bool
+    _basic_auth: bytes = None
+    _api_helper: APIHelper
+    _system_ids: list[uuid] = field(default_factory=list)
+
+    def __init__(self, address: str, port: int, username: str = None, password: str = None, **kwargs: dict):
+        self._id = f'node-{uuid.uuid4()}'
+        self.address = address
+        self.port = port
+        self.is_secure = username is not None and password is not None
+        if self.is_secure:
+            self.add_basicauth(username, password)
+        self.endpoints = Endpoints()
+        self._api_helper = APIHelper(server_url=f'{self.address}:{self.port}',
+                                     api_root=self.endpoints.connected_systems, username=username, password=password)
+        if self.is_secure:
+            self._api_helper.user_auth = True
+        self._system_ids = []
+
+    def get_id(self):
+        return self._id
+
+    def get_address(self):
+        return self.address
+
+    def get_port(self):
+        return self.port
+
+    def get_api_endpoint(self):
+        return f"http{'s' if self.is_secure else ''}://{self.address}:{self.port}/{self.endpoints.connected_systems}"
+
+    def add_basicauth(self, username: str, password: str):
+        if not self.is_secure:
+            self.is_secure = True
+        self._basic_auth = base64.b64encode(f"{username}:{password}".encode('utf-8'))
+
+    def get_decoded_auth(self):
+        return self._basic_auth.decode('utf-8')
+
+    def discover_systems(self):
+        result = self._api_helper.retrieve_resource(APIResourceTypes.SYSTEM, req_headers={})
+        if result.ok:
+            new_systems = []
+            system_objs = result.json()['items']
+            print(system_objs)
+            for system_json in system_objs:
+                print(system_json)
+                system = SystemResource.model_validate(system_json)
+                sys_obj = System.from_system_resource(system)
+                sys_obj.update_parent_node(self)
+                self._system_ids.append(sys_obj.uid)
+                new_systems.append(sys_obj)
+            return new_systems
+        else:
+            return None
+
+    def add_new_system(self, system: System):
+        self._system_ids.append(system.uid)
 
 
 class System:
@@ -33,8 +104,15 @@ def update_parent_node(self, node: Node):
 
     @staticmethod
     def from_system_resource(system_resource: SystemResource):
-        other_props = SystemResource.__dict__
-        return System(name=system_resource.name, label=system_resource.label)
+        other_props = system_resource.dict()
+        print(f'Props of SystemResource: {other_props}')
+
+        # case 1: has properties a la geojson
+        if 'properties' in other_props:
+            new_system = System(name=other_props['properties']['name'], label=other_props['properties']['name'])
+        else:
+            new_system = System(name=system_resource.name, label=system_resource.label)
+        return new_system
 
 
 class Datastream:

oshconnect/oshconnect.py

@@ -5,16 +5,13 @@
 #  Contact email:  ian@botts-inc.com
 #   ==============================================================================
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder, ConnectedSystemAPIRequest
 from conSys4Py.core.default_api_helpers import APIHelper
-from conSys4Py.part_1 import systems
 
-from external_models.object_models import System
-from oshconnect import Node
+from oshconnect.datamodels.datamodels import Node, System
 from oshconnect.datasource.datasource import DataSource
+from oshconnect.datastore.datastore import DataStore
 from oshconnect.styling.styling import Styling
 from oshconnect.timemanagement.timemanagement import TimeManagement
-from oshconnect.datastore.datastore import DataStore
 
 
 class OSHConnect:
@@ -24,6 +21,7 @@ class OSHConnect:
     styling: Styling = None
     timestream: TimeManagement = None
     _nodes: list[Node] = []
+    _systems: list[System] = []
     _cs_api_builder: APIHelper = None
     _datafeeds: list[DataSource] = []
     _datataskers: list[DataStore] = []
@@ -94,21 +92,9 @@ def discover_systems(self, nodes: list[str] = None):
         if nodes is not None:
             search_nodes = [node for node in search_nodes if node.get_id() in nodes]
 
-        results = []
         for node in search_nodes:
-            result = node.discover_systems()
-            print(f'Result: {result}')
-            results.append(result)
-
-        new_systems = []
-        # convert results of conceptual system objects
-        for result in results:
-            for system_json in result['items']:
-                print(system_json)
-                system = System.model_validate(system_json)
-                new_systems.append(system)
-
-        return new_systems
+            res_systems = node.discover_systems()
+            self._systems.extend(res_systems)
 
     def discover_controlstreams(self, streams: list):
         pass

tests/test_oshconnect.py

@@ -1,4 +1,3 @@
-
 #   ==============================================================================
 #   Copyright (c) 2024 Botts Innovative Research, Inc.
 #   Date:  2024/5/28
@@ -9,7 +8,7 @@
 import pytest
 
 from oshconnect.oshconnect import OSHConnect
-from oshconnect import Node
+from oshconnect.datamodels.datamodels import Node, System
 
 
 class TestOSHConnect:
@@ -29,10 +28,10 @@ def test_oshconnect_add_node(self):
 
     def test_find_systems(self):
         app = OSHConnect(name="Test OSH Connect")
-        node = Node(address="http://localhost", port=8585, is_secure=True, username="admin", password="admin")
+        node = Node(address="http://localhost", port=8585, username="admin", password="admin")
         # node.add_basicauth("admin", "admin")
         app.add_node(node)
-        systems = app.discover_systems()
-        print(systems)
+        app.discover_systems()
+        print(f'Found systems: {app._systems}')
         # assert len(systems) == 1
         # assert systems[0] == node.get_api_endpoint()