Merge pull request #16 from Botts-Innovative-Research/dep-fix-refactor

Fix dependency issues

Author: tipatterson-dev

oshconnect/control.py

@@ -5,9 +5,9 @@
 #   Contact Email:  ian@botts-inc.com
 #   ==============================================================================
 import websockets
-from conSys4Py.comm.mqtt import MQTTCommClient
-from conSys4Py.datamodels.commands import CommandJSON
-from conSys4Py.datamodels.control_streams import ControlStreamJSONSchema
+from consys4py.comm.mqtt import MQTTCommClient
+from consys4py.datamodels.commands import CommandJSON
+from consys4py.datamodels.control_streams import ControlStreamJSONSchema
 
 from oshconnect.osh_connect_datamodels import System
 

oshconnect/core_datamodels.py

@@ -8,9 +8,9 @@
 
 from typing import List
 
-from conSys4Py.datamodels.swe_components import Geometry
-from conSys4Py.datamodels.datastreams import DatastreamSchema
-from conSys4Py.datamodels.api_utils import Link
+from consys4py.datamodels.swe_components import Geometry
+from consys4py.datamodels.datastreams import DatastreamSchema
+from consys4py.datamodels.api_utils import Link
 from pydantic import BaseModel, ConfigDict, Field, SerializeAsAny
 from shapely import Point
 

oshconnect/datasource.py

@@ -16,9 +16,9 @@
 
 import requests
 import websockets
-from conSys4Py.constants import APIResourceTypes
-from conSys4Py.datamodels.observations import ObservationOMJSONInline
-from conSys4Py.datamodels.swe_components import DataRecordSchema
+from consys4py.constants import APIResourceTypes
+from consys4py.datamodels.observations import ObservationOMJSONInline
+from consys4py.datamodels.swe_components import DataRecordSchema
 
 from .core_datamodels import DatastreamResource, SystemResource, TimePeriod
 from .timemanagement import TemporalModes
@@ -73,7 +73,7 @@ def __init__(self, name: str, datastream: DatastreamResource,
 
             # t_url = f'http://{self._parent_system.get_parent_node().get_address()}:{self._parent_system.get_parent_node().get_port()}'
             #
-            # res = conSys4Py.part_2.datastreams.retrieve_datastream_schema(t_url,
+            # res = consys4py.part_2.datastreams.retrieve_datastream_schema(t_url,
             #                                                               datastream_id=self._datastream.ds_id,
             #                                                               api_root=self._parent_system.get_parent_node()._api_helper.api_root,
             #                                                               headers=self._extra_headers)

oshconnect/osh_connect_datamodels.py

@@ -10,11 +10,11 @@
 import uuid
 from dataclasses import dataclass, field
 
-from conSys4Py.constants import APIResourceTypes
-from conSys4Py.core.default_api_helpers import APIHelper
-from conSys4Py.datamodels.datastreams import SWEDatastreamSchema
-from conSys4Py.datamodels.encoding import JSONEncoding
-from conSys4Py.datamodels.swe_components import DataRecordSchema
+from consys4py.constants import APIResourceTypes
+from consys4py.core.default_api_helpers import APIHelper
+from consys4py.datamodels.datastreams import SWEDatastreamSchema
+from consys4py.datamodels.encoding import JSONEncoding
+from consys4py.datamodels.swe_components import DataRecordSchema
 
 from .core_datamodels import DatastreamResource, ObservationResource, SystemResource
 from .timemanagement import TimeInstant, TimePeriod, TimeUtils

oshconnect/oshconnectapi.py

@@ -7,7 +7,7 @@
 import logging
 import shelve
 
-from conSys4Py.core.default_api_helpers import APIHelper
+from consys4py.core.default_api_helpers import APIHelper
 
 from .core_datamodels import DatastreamResource, TimePeriod
 from .datasource import DataStream, DataStreamHandler, MessageWrapper

pyproject.toml

@@ -1,17 +1,17 @@
 [tool.poetry]
 name = "oshconnect"
-version = "0.2.0"
+version = "0.2.1"
 description = "Library for interfacing with OSH, helping guide visualization efforts, and providing a place to store configurations."
 authors = ["Ian Patterson <ian@botts-inc.com@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.12"
-conSys4Py = { git = "https://github.com/Botts-Innovative-Research/CSAPI4Py.git", branch = "dev" }
-swecommondm = { git = "https://github.com/ChainReaction31/SWECommonDMPython.git", branch = "master" }
 pydantic = "^2.7.4"
 shapely = "^2.0.4"
 websockets = "^12.0"
+consys4py = "^0.0.1a1"
+swecommondm = "^0.0.1a0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.2"