correctly reference consys4py

tipatterson-dev · tipatterson-dev · commit e1fc38edffeb · 2025-02-21T20:54:00.000-06:00
diff --git a/conSys4Py/con_sys_api.py b/conSys4Py/con_sys_api.py
@@ -2,8 +2,8 @@
 
 from pydantic import BaseModel, HttpUrl, Field
 
-from conSys4Py.endpoints import Endpoint
-from conSys4Py.request_wrappers import post_request, put_request, get_request, delete_request
+from consys4py.endpoints import Endpoint
+from consys4py.request_wrappers import post_request, put_request, get_request, delete_request
 
 
 class ConnectedSystemAPIRequest(BaseModel):
diff --git a/conSys4Py/core/default_api_helpers.py b/conSys4Py/core/default_api_helpers.py
@@ -5,8 +5,8 @@
 
 from pydantic import BaseModel, Field
 
-from conSys4Py.con_sys_api import ConnectedSystemAPIRequest
-from conSys4Py.constants import APIResourceTypes, EncodingSchema, APITerms
+from consys4py.con_sys_api import ConnectedSystemAPIRequest
+from consys4py.constants import APIResourceTypes, EncodingSchema, APITerms
 
 
 def determine_parent_type(res_type: APIResourceTypes):
diff --git a/conSys4Py/datamodels/control_streams.py b/conSys4Py/datamodels/control_streams.py
@@ -4,8 +4,8 @@
 
 from pydantic import BaseModel, Field, SerializeAsAny
 
-from conSys4Py.datamodels.encoding import Encoding
-from conSys4Py.datamodels.swe_components import AnyComponentSchema
+from consys4py.datamodels.encoding import Encoding
+from consys4py.datamodels.swe_components import AnyComponentSchema
 
 
 class ControlStreamJSONSchema(BaseModel):
diff --git a/conSys4Py/datamodels/datastreams.py b/conSys4Py/datamodels/datastreams.py
@@ -1,8 +1,8 @@
 from pydantic import BaseModel, Field, field_validator, SerializeAsAny
 
-from conSys4Py.constants import ObservationFormat
-from conSys4Py.datamodels.encoding import Encoding
-from conSys4Py.datamodels.swe_components import AnyComponentSchema
+from consys4py.constants import ObservationFormat
+from consys4py.datamodels.encoding import Encoding
+from consys4py.datamodels.swe_components import AnyComponentSchema
 
 
 class DatastreamSchema(BaseModel):
diff --git a/conSys4Py/datamodels/geometry.py b/conSys4Py/datamodels/geometry.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 
-from conSys4Py.constants import GeometryTypes
+from consys4py.constants import GeometryTypes
 
 
 # TODO: Add specific validations for each type
diff --git a/conSys4Py/datamodels/observations.py b/conSys4Py/datamodels/observations.py
@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel, Field
 
-from conSys4Py.datamodels.api_utils import Link
+from consys4py.datamodels.api_utils import Link
 
 
 class ObservationOMJSONInline(BaseModel):
diff --git a/conSys4Py/datamodels/swe_components.py b/conSys4Py/datamodels/swe_components.py
@@ -5,9 +5,9 @@
 
 from pydantic import BaseModel, Field, field_validator, SerializeAsAny
 
-from conSys4Py.constants import GeometryTypes
-from conSys4Py.datamodels.api_utils import UCUMCode, URI
-from conSys4Py.datamodels.geometry import Geometry
+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
diff --git a/conSys4Py/datamodels/system_events_and_history.py b/conSys4Py/datamodels/system_events_and_history.py
@@ -2,8 +2,8 @@
 
 from pydantic import BaseModel, Field, HttpUrl
 
-from conSys4Py.datamodels.api_utils import Link, URI
-from conSys4Py.datamodels.geometry import Geometry
+from consys4py.datamodels.api_utils import Link, URI
+from consys4py.datamodels.geometry import Geometry
 
 
 class SystemEventOMJSON(BaseModel):
diff --git a/conSys4Py/endpoints.py b/conSys4Py/endpoints.py
@@ -4,7 +4,7 @@
 # import websockets
 from pydantic import BaseModel, Field
 
-from conSys4Py.constants import APITerms
+from consys4py.constants import APITerms
 
 
 class Endpoint(BaseModel):
diff --git a/conSys4Py/part_1/capabilities.py b/conSys4Py/part_1/capabilities.py
@@ -1,7 +1,7 @@
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def get_landing_page(server_addr: HttpUrl, api_root: str = APITerms.API.value):
diff --git a/conSys4Py/part_1/collections_ep.py b/conSys4Py/part_1/collections_ep.py
@@ -1,7 +1,7 @@
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_collections(server_addr: HttpUrl, api_root: str = APITerms.API.value):
diff --git a/conSys4Py/part_1/deployments.py b/conSys4Py/part_1/deployments.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_deployments(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_1/procedures.py b/conSys4Py/part_1/procedures.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_procedures(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_1/properties.py b/conSys4Py/part_1/properties.py
@@ -1,7 +1,7 @@
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_properties(server_addr: HttpUrl, api_root: str = APITerms.API.value):
diff --git a/conSys4Py/part_1/sampling_features.py b/conSys4Py/part_1/sampling_features.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_sampling_features(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers=None):
diff --git a/conSys4Py/part_1/systems.py b/conSys4Py/part_1/systems.py
@@ -3,9 +3,9 @@
 import requests
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
-from conSys4Py.request_wrappers import post_request
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
+from consys4py.request_wrappers import post_request
 
 
 def list_all_systems(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_2/commands.py b/conSys4Py/part_2/commands.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_commands(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_2/control_channels.py b/conSys4Py/part_2/control_channels.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_control_streams(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_2/datastreams.py b/conSys4Py/part_2/datastreams.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_datastreams(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_2/observations.py b/conSys4Py/part_2/observations.py
@@ -2,8 +2,8 @@
 
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_all_observations(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers=None):
diff --git a/conSys4Py/part_2/system_events.py b/conSys4Py/part_2/system_events.py
@@ -1,7 +1,7 @@
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_system_events(server_addr: HttpUrl, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/part_2/system_history.py b/conSys4Py/part_2/system_history.py
@@ -1,7 +1,7 @@
 from pydantic import HttpUrl
 
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
-from conSys4Py.constants import APITerms
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.constants import APITerms
 
 
 def list_system_history(server_addr: HttpUrl, system_id: str, api_root: str = APITerms.API.value, headers: dict = None):
diff --git a/conSys4Py/request_bodies.py b/conSys4Py/request_bodies.py
@@ -2,10 +2,10 @@
 
 from pydantic import BaseModel, HttpUrl, Field, model_serializer, RootModel, SerializeAsAny
 
-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
+from consys4py.datamodels.datastreams import DatastreamSchema
+from consys4py.datamodels.geometry import Geometry
+from consys4py.sensor_ml.sml import TypeOf
 
 
 # TODO: Consider some sort of Abstract Base Class for all valid request bodies to inherit from to reduce the complexity
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -21,7 +21,7 @@ def setup(app):
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-project = 'conSys4Py'
+project = 'consys4py'
 copyright = '2024, Botts Innovative Research, Inc.'
 author = 'Ian Patterson'
 release = '0.1'
diff --git a/docs/source/pydocs.rst b/docs/source/pydocs.rst
@@ -1,7 +1,7 @@
 ConSys4Py API Docs
 ==================
 
-.. automodule:: conSys4Py
+.. automodule:: consys4py
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "consys4py"
-version = "0.0.1-alpha.6"
+version = "0.0.1-alpha.7"
 authors = ["Ian Patterson <ian@botts-inc.com>"]
 description = "OGC Connected Systems API client for Python"
 readme = "README.md"
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -2,11 +2,11 @@
 import time
 from datetime import datetime
 
-from conSys4Py import GeoJSONBody, Systems, ControlChannels, ObservationFormat, Commands
-from conSys4Py.datamodels.commands import CommandJSON
-from conSys4Py.datamodels.control_streams import ControlStreamJSONSchema, JSONControlChannelSchema
-from conSys4Py.datamodels.swe_components import DataRecordSchema, TimeSchema, CountSchema, URI
-from conSys4Py.comm.mqtt import MQTTCommClient
+from consys4py import GeoJSONBody, Systems, ControlChannels, ObservationFormat, Commands
+from consys4py.datamodels.commands import CommandJSON
+from consys4py.datamodels.control_streams import ControlStreamJSONSchema, JSONControlChannelSchema
+from consys4py.datamodels.swe_components import DataRecordSchema, TimeSchema, CountSchema, URI
+from consys4py.comm.mqtt import MQTTCommClient
 
 server_url = "http://localhost:8282/sensorhub"
 geo_json_headers = {"Content-Type": "application/geo+json"}
diff --git a/tests/test_default_api_helpers.py b/tests/test_default_api_helpers.py
@@ -1,5 +1,5 @@
-import conSys4Py.core.default_api_helpers as helpers
-from conSys4Py import APIResourceTypes, GeoJSONBody
+import consys4py.core.default_api_helpers as helpers
+from consys4py import APIResourceTypes, GeoJSONBody
 
 server_url = 'http://localhost:8282/sensorhub'
 api_endpoint = 'api'
diff --git a/tests/test_delete_all.py b/tests/test_delete_all.py
@@ -1,4 +1,4 @@
-from conSys4Py import Systems, SamplingFeatures, Datastreams, Procedures, ControlChannels, Observations, \
+from consys4py import Systems, SamplingFeatures, Datastreams, Procedures, ControlChannels, Observations, \
     Commands
 
 server_url = 'http://localhost:8282/sensorhub'
diff --git a/tests/test_params.py b/tests/test_params.py
@@ -1,4 +1,4 @@
-from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
+from consys4py.con_sys_api import ConnectedSystemsRequestBuilder
 
 
 def test_get_params():
diff --git a/tests/test_script_full_suite.py b/tests/test_script_full_suite.py
@@ -1,17 +1,17 @@
 import random
 from datetime import datetime
 
-from conSys4Py.constants import ObservationFormat
-from conSys4Py.datamodels.api_utils import URI
-from conSys4Py.datamodels.control_streams import ControlStreamJSONSchema, SWEControlChannelSchema, \
+from consys4py.constants import ObservationFormat
+from consys4py.datamodels.api_utils import URI
+from consys4py.datamodels.control_streams import ControlStreamJSONSchema, SWEControlChannelSchema, \
     JSONControlChannelSchema
-from conSys4Py.datamodels.datastreams import SWEDatastreamSchema
-from conSys4Py.datamodels.encoding import JSONEncoding
-from conSys4Py.datamodels.geometry import Geometry
-from conSys4Py.datamodels.swe_components import BooleanSchema, TimeSchema, DataRecordSchema, CountSchema
-from conSys4Py.datamodels.observations import ObservationOMJSONInline
-from conSys4Py.datamodels.commands import CommandJSON
-from conSys4Py.part_1 import systems, deployments, sampling_features
+from consys4py.datamodels.datastreams import SWEDatastreamSchema
+from consys4py.datamodels.encoding import JSONEncoding
+from consys4py.datamodels.geometry import Geometry
+from consys4py.datamodels.swe_components import BooleanSchema, TimeSchema, DataRecordSchema, CountSchema
+from consys4py.datamodels.observations import ObservationOMJSONInline
+from consys4py.datamodels.commands import CommandJSON
+from consys4py.part_1 import systems, deployments, sampling_features
 from conSys4Py.part_2 import datastreams, observations, commands, control_channels
 from conSys4Py.request_bodies import DatastreamBodyJSON, GeoJSONBody, SmlJSONBody
 from conSys4Py.utilities import model_utils
diff --git a/tests/test_system_events_and_history.py b/tests/test_system_events_and_history.py
@@ -2,16 +2,16 @@
 
 from datetime import datetime
 
-from conSys4Py import Systems, SamplingFeatures, Datastreams, SmlJSONBody, GeoJSONBody, model_utils, \
+from consys4py import Systems, SamplingFeatures, Datastreams, SmlJSONBody, GeoJSONBody, model_utils, \
     DatastreamBodyJSON, ObservationFormat, URI, Procedures, Geometry, Deployments, ControlChannels, Observations, \
     Commands
-from conSys4Py.datamodels.control_streams import ControlStreamJSONSchema, SWEControlChannelSchema, JSONControlChannelSchema
-from conSys4Py.datamodels.datastreams import SWEDatastreamSchema
-from conSys4Py.datamodels.encoding import JSONEncoding
-from conSys4Py.datamodels.swe_components import BooleanSchema, TimeSchema, DataRecordSchema, CountSchema
-from conSys4Py.datamodels.observations import ObservationOMJSONInline
-from conSys4Py.datamodels.commands import CommandJSON
-from conSys4Py.datamodels.system_events_and_history import SystemEventOMJSON
+from consys4py.datamodels.control_streams import ControlStreamJSONSchema, SWEControlChannelSchema, JSONControlChannelSchema
+from consys4py.datamodels.datastreams import SWEDatastreamSchema
+from consys4py.datamodels.encoding import JSONEncoding
+from consys4py.datamodels.swe_components import BooleanSchema, TimeSchema, DataRecordSchema, CountSchema
+from consys4py.datamodels.observations import ObservationOMJSONInline
+from consys4py.datamodels.commands import CommandJSON
+from consys4py.datamodels.system_events_and_history import SystemEventOMJSON
 
 server_url = "http://localhost:8282/sensorhub"
 geo_json_headers = {"Content-Type": "application/geo+json"}
diff --git a/tests/test_systems.py b/tests/test_systems.py
@@ -1,6 +1,6 @@
 from pydantic import HttpUrl
 
-from conSys4Py.part_1.systems import list_all_systems, retrieve_system_by_id, list_all_systems_in_collection, \
+from consys4py.part_1.systems import list_all_systems, retrieve_system_by_id, list_all_systems_in_collection, \
     list_system_components, list_sampling_features_of_system
 
 
