fix import references

Author: tipatterson-dev

conSys4Py/core/default_api_helpers.py

@@ -5,8 +5,8 @@
 
 from pydantic import BaseModel, Field
 
-from conSys4Py import APIResourceTypes, APITerms, EncodingSchema
 from conSys4Py.con_sys_api import ConnectedSystemAPIRequest
+from conSys4Py.constants import APIResourceTypes, EncodingSchema, APITerms
 
 
 def determine_parent_type(res_type: APIResourceTypes):

conSys4Py/datamodels/control_streams.py

@@ -4,8 +4,8 @@
 
 from pydantic import BaseModel, Field, SerializeAsAny
 
-from conSys4Py import AnyComponentSchema
 from conSys4Py.datamodels.encoding import Encoding
+from conSys4Py.datamodels.swe_components import AnyComponentSchema
 
 
 class ControlStreamJSONSchema(BaseModel):

conSys4Py/datamodels/datastreams.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field, field_validator, SerializeAsAny
 
-from conSys4Py import ObservationFormat
+from conSys4Py.constants import ObservationFormat
 from conSys4Py.datamodels.encoding import Encoding
 from conSys4Py.datamodels.swe_components import AnyComponentSchema
 

conSys4Py/datamodels/geometry.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 
-from conSys4Py import GeometryTypes
+from conSys4Py.constants import GeometryTypes
 
 
 # TODO: Add specific validations for each type

conSys4Py/datamodels/system_events_and_history.py

@@ -1,10 +1,9 @@
-
 from __future__ import annotations
 
 from pydantic import BaseModel, Field, HttpUrl
 
-from conSys4Py import Geometry
 from conSys4Py.datamodels.api_utils import Link, URI
+from conSys4Py.datamodels.geometry import Geometry
 
 
 class SystemEventOMJSON(BaseModel):

conSys4Py/request_bodies.py

@@ -2,10 +2,10 @@
 
 from pydantic import BaseModel, HttpUrl, Field, model_serializer, RootModel, SerializeAsAny
 
-from conSys4Py import Geometry
+from conSys4Py.constants import DatastreamResultTypes
 from conSys4Py.datamodels.datastreams import DatastreamSchema
+from conSys4Py.datamodels.geometry import Geometry
 from conSys4Py.sensor_ml.sml import TypeOf
-from conSys4Py.constants import DatastreamResultTypes
 
 
 # TODO: Consider some sort of Abstract Base Class for all valid request bodies to inherit from to reduce the complexity