fix a minor error with a default value in GeometrySchema

- remove references in init.py to clean a few references up
- fix flake8 linting errors
- there is a warning in geometry schema still, but should not cause an issue for the time being

Author: tipatterson-dev

conSys4Py/__init__.py

@@ -1,18 +0,0 @@
-from .constants import *
-from .datamodels.swe_components import *
-from .part_1 import capabilities as Capabilities
-from .part_1 import collections_ep as Collections
-from .part_1 import deployments as Deployments
-from .part_1 import procedures as Procedures
-from .part_1 import properties as Properties
-from .part_1 import sampling_features as SamplingFeatures
-from .part_1 import systems as Systems
-from .part_2 import commands as Commands
-from .part_2 import control_channels as ControlChannels
-from .part_2 import datastreams as Datastreams
-from .part_2 import observations as Observations
-from .part_2 import system_events as SystemEvents
-from .part_2 import system_history as SystemHistory
-from .querymodel import QueryModel
-from .request_bodies import *
-from .utilities import model_utils

conSys4Py/datamodels/control_streams.py

@@ -21,7 +21,8 @@ class ControlStreamJSONSchema(BaseModel):
     valid_time: list = Field(None, serialization_alias='validTime')
     input_name: str = Field(None, serialization_alias='inputName')
     links: list = Field(None)
-    control_stream_schema: SerializeAsAny[Union[SWEControlChannelSchema, JSONControlChannelSchema]] = Field(..., serialization_alias='schema')
+    control_stream_schema: SerializeAsAny[Union[SWEControlChannelSchema, JSONControlChannelSchema]] = Field(...,
+                                                                                                            serialization_alias='schema')
 
 
 class SWEControlChannelSchema(BaseModel):
@@ -35,4 +36,4 @@ class SWEControlChannelSchema(BaseModel):
 
 class JSONControlChannelSchema(BaseModel):
     command_format: str = Field("application/cmd+json", serialization_alias='commandFormat')
-    params_schema: SerializeAsAny[AnyComponentSchema] = Field(..., serialization_alias='paramsSchema')
+    params_schema: SerializeAsAny[AnyComponentSchema] = Field(..., serialization_alias='paramsSchema')

conSys4Py/datamodels/geometry.py

@@ -10,4 +10,4 @@ class Geometry(BaseModel):
     """
     type: GeometryTypes = Field(...)
     coordinates: list
-    bbox: list = None
+    bbox: list = None

conSys4Py/datamodels/network_properties.py

@@ -7,4 +7,4 @@ class NetworkProperties(BaseModel):
     stream_protocol: str = 'ws'
     mqtt_opts: dict = None
     mqtt_endpoint_url: HttpUrl = None
-    connector_opts: dict = None
+    connector_opts: dict = None

conSys4Py/datamodels/observations.py

@@ -1,7 +1,7 @@
 from datetime import datetime
+from typing import Union, List
 
 from pydantic import BaseModel, Field
-from typing import Union, Optional, List
 
 from conSys4Py.datamodels.api_utils import Link
 
@@ -17,4 +17,3 @@ class ObservationOMJSONInline(BaseModel):
     parameters: dict = Field(None)
     result: Union[int, float, str, dict, list] = Field(...)
     result_links: List[Link] = Field(None, serialization_alias="result@links")
-

conSys4Py/datamodels/swe_components.py

@@ -5,14 +5,14 @@
 
 from pydantic import BaseModel, Field, field_validator, SerializeAsAny
 
-from conSys4Py import GeometryTypes
+from conSys4Py.constants import GeometryTypes
 from conSys4Py.datamodels.api_utils import UCUMCode, URI
 from conSys4Py.datamodels.geometry import Geometry
 
 """
  NOTE: The following classes are used to represent the Record Schemas that are required for use with Datastreams
 The names are likely to change to include a "Schema" suffix to differentiate them from the actual data structures.
-The current scope of the project likely excludes conversion from received data to actual SWE Common data structures, 
+The current scope of the project likely excludes conversion from received data to actual SWE Common data structures,
 in the event this is added it will most likely be in a separate module as those structures have use cases outside of
 the API solely
 """
@@ -80,10 +80,10 @@ class GeometrySchema(AnyComponentSchema):
     updatable: bool = Field(False)
     optional: bool = Field(False)
     definition: str = Field(...)
-    constraint: dict = {
-        'geomTypes': [GeometryTypes.POINT.value, GeometryTypes.LINESTRING.value, GeometryTypes.POLYGON.value,
-                      GeometryTypes.MULTI_POINT.value, GeometryTypes.MULTI_LINESTRING.value,
-                      GeometryTypes.MULTI_POLYGON.value]}
+    constraint: dict = Field(default_factory=dict(
+        geomTypes=[GeometryTypes.POINT.value, GeometryTypes.LINESTRING.value, GeometryTypes.POLYGON.value,
+                   GeometryTypes.MULTI_POINT.value, GeometryTypes.MULTI_LINESTRING.value,
+                   GeometryTypes.MULTI_POLYGON.value]))
     nil_values: list = Field(None, serialization_alias='nilValues')
     srs: str = Field(...)
     value: Geometry = Field(None)

conSys4Py/part_2/control_channels.py

@@ -1,6 +1,5 @@
 from typing import Union
 
-import requests
 from pydantic import HttpUrl
 
 from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder

conSys4Py/part_2/datastreams.py

@@ -1,6 +1,5 @@
 from typing import Union
 
-import requests
 from pydantic import HttpUrl
 
 from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder

conSys4Py/part_2/observations.py

@@ -1,6 +1,5 @@
 from typing import Union
 
-import requests
 from pydantic import HttpUrl
 
 from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder