Fix noted bugs from out-of-date imports

Author: tipatterson-dev

oshconnect/__init__.py

@@ -5,5 +5,5 @@
 #   Contact Email:  [email protected]
 #   ==============================================================================
 
-class Example:
-    pass
+from .oshconnectapi import OSHConnect, Node
+from .osh_connect_datamodels import System, Node, Datastream, Observation, ControlChannel

oshconnect/csapi4py/part_2/__init__.py

@@ -0,0 +1,6 @@
+# import commands
+# import control_channels
+# import datastreams
+# import observations
+# import system_events
+# import system_history

oshconnect/datamodels/__init__.py

@@ -0,0 +1,10 @@
+# import api_utils
+# import commands
+# import control_streams
+# import datastreams
+# import encoding
+# import geometry
+# import network_properties
+# import observations
+# import swe_components
+# import system_events_and_history

oshconnect/datamodels/geometry.py

@@ -1,10 +1,11 @@
 from pydantic import BaseModel, Field
 
 from oshconnect.csapi4py.constants import GeometryTypes
+from shapely import Geometry
 
 
 # TODO: Add specific validations for each type
-# TODO: update to either use third party Geometry definitions or create a more robust definition
+# TODO: determine if serializing 'shapely' objects gives valid JSON structures from our own serialization
 class Geometry(BaseModel):
     """
     A class to represent the geometry of a feature

oshconnect/datasource.py

@@ -21,7 +21,7 @@
 from oshconnect.datamodels.swe_components import DataRecordSchema
 
 from .core_datamodels import DatastreamResource, SystemResource, TimePeriod
-from .timemanagement import TemporalModes
+from .timemanagement import TemporalModes, Synchronizer
 
 
 # from swecommondm.component_implementations import DataRecord
@@ -48,6 +48,7 @@ class DataStream:
     _playback_websocket: websockets.WebSocketClientProtocol = None
     _extra_headers: dict = None
     _result_schema: DataRecordSchema = None
+    _synchronizer: Synchronizer = None
 
     def __init__(self, name: str, datastream: DatastreamResource,
                  parent_system: SystemResource):

oshconnect/oshconnectapi.py

@@ -8,7 +8,6 @@
 import shelve
 
 from oshconnect.csapi4py.core.default_api_helpers import APIHelper
-
 from .core_datamodels import DatastreamResource, TimePeriod
 from .datasource import DataStream, DataStreamHandler, MessageWrapper
 from .datastore import DataStore
@@ -26,7 +25,7 @@ class OSHConnect:
     _systems: list[System] = []
     _cs_api_builder: APIHelper = None
     _datasource_handler: DataStreamHandler = None
-    _datafeeds: list[DataStream] = []
+    _datastreams: list[DataStream] = []
     _datataskers: list[DataStore] = []
     _datagroups: list = []
     _tasks: list = []
@@ -150,7 +149,7 @@ def discover_datastreams(self):
                 DataStream(name=ds.name, datastream=ds, parent_system=system)
                 for ds in
                 res_datastreams]
-            self._datafeeds.extend(new_datasource)
+            self._datastreams.extend(new_datasource)
             list(map(self._datasource_handler.add_datasource, new_datasource))
 
     def discover_systems(self, nodes: list[str] = None):
@@ -199,7 +198,7 @@ def get_message_list(self) -> list[MessageWrapper]:
         """
         return self._datasource_handler.get_messages()
 
-    def insert_system(self, system: System, target_node: Node):
+    def _insert_system(self, system: System, target_node: Node):
         """
         Create a system on the target node.
         :param system: System object
@@ -227,7 +226,7 @@ def insert_datastream(self, datastream: DatastreamResource, system: str | System
 
         sys_obj.add_insert_datastream(datastream)
 
-        self._datafeeds.append(datastream)
+        self._datastreams.append(datastream)
 
     def find_system(self, system_id: str) -> System | None:
         """
@@ -270,3 +269,7 @@ def create_and_insert_system(self, system_opts: dict, target_node: Node):
 
     def remove_system(self, system_id: str):
         pass
+
+    # DataStream Helpers
+    def get_datastreams(self) -> list[DataStream]:
+        return self._datastreams

oshconnect/timemanagement.py

@@ -299,12 +299,6 @@ def does_timeperiod_overlap(self, checked_timeperiod: TimePeriod) -> bool:
             return True
 
 
-class Utilities:
-    pass
-    # @staticmethod
-    # def parse_systems_result(result) -> System:
-
-
 class TimeManagement:
     time_range: TimePeriod
     time_controller: TimeController
@@ -329,6 +323,7 @@ class TimeController:
     _timeline_begin: TimeInstant
     _timeline_end: TimeInstant
     _current_time: TimeInstant
+    _synchronizer: Synchronizer
 
     def __new__(cls, *args, **kwargs):
         if cls._instance is None:
@@ -420,6 +415,10 @@ def _compute_time_range(self):
 
 class Synchronizer:
     _buffer: any
+    _buffering_time: int
 
     def synchronize(self, systems: list):
         pass
+
+    def check_in_sync(self):
+        pass

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oshconnect"
-version = "0.2.4-1"
+version = "0.3.0a1"
 description = "Library for interfacing with OSH, helping guide visualization efforts, and providing a place to store configurations."
 readme = "README.md"
 authors = [
@@ -9,17 +9,17 @@ authors = [
 requires-python = "<4.0,>=3.12"
 dependencies = [
     "paho-mqtt>=2.1.0",
-    "pydantic<3.0.0,>=2.7.4",
-    "shapely<3.0.0,>=2.0.4",
-    "websockets<13.0,>=12.0",
+    "pydantic>=2.7.4,<3.0.0",
+    "shapely>=2.0.4,<3.0.0",
+    "websockets>=12.0,<16.0",
 ]
 
 [dependency-groups]
 dev = [
-    "pytest<9.0.0,>=8.2.2",
-    "sphinx<8.0.0,>=7.3.7",
-    "flake8<8.0.0,>=7.1.0",
-    "sphinx-rtd-theme<3.0.0,>=2.0.0",
+    "flake8>=7.2.0",
+    "pytest>=8.3.5",
+    "sphinx>=7.4.7",
+    "sphinx-rtd-theme>=2.0.0",
 ]
 
 [tool.setuptools]

tests/test_api_update.py

@@ -0,0 +1,6 @@
+import pytest
+
+from oshconnect import OSHConnect, System, Node, Datastream
+
+node = Node()
+app = OSHConnect()

tests/test_oshconnect.py

@@ -68,7 +68,7 @@ def test_oshconnect_find_datastreams(self):
         app.discover_systems()
 
         app.discover_datastreams()
-        assert len(app._datafeeds) > 0
+        assert len(app._datastreams) > 0
 
     async def test_obs_ws_stream(self):
         ds_url = ("ws://localhost:8585/sensorhub/api/datastreams/e07n5sbjqvalm/observations?f=application%2Fjson"