convert back to setuptools for ease of use and interop reason, update some test cases

Author: tipatterson-dev

pyproject.toml

@@ -1,25 +1,27 @@
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
 
-[tool.poetry]
+[project]
 name = "conSys4Py"
-version = "0.0.1-alpha.1"
-authors = ["Ian Patterson <ian@botts-inc.com>"]
+version = "0.0.1-alpha.3"
+authors = [
+    { name = "Ian Patterson", email = "ian@botts-inc.com" }
+]
 description = "OGC Connected Systems API client for Python"
 readme = "README.md"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3.10",
     "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
     "Operating System :: OS Independent"
 ]
 
-[tool.poetry.dependencies]
-python = "^3.10"
-pydantic = "^2.6.3"
-requests = "^2.31.0"
-paho-mqtt = "^2.0.0"
-
+dependencies = [
+    "pydantic",
+    "requests",
+    "paho-mqtt"
+]
 
 [project.urls]
 "Homepage" = "https://opensensorhub.org"

requirements.txt

@@ -0,0 +1,10 @@
+annotated-types==0.6.0
+certifi==2024.2.2
+charset-normalizer==3.3.2
+idna==3.6
+paho-mqtt==2.0.0
+pydantic==2.6.4
+pydantic_core==2.16.3
+requests==2.31.0
+typing_extensions==4.10.0
+urllib3==2.2.1

tests/test_params.py

@@ -0,0 +1,14 @@
+from conSys4Py.con_sys_api import ConnectedSystemsRequestBuilder
+
+
+def test_get_params():
+    builder = ConnectedSystemsRequestBuilder()
+    api_request = (builder.with_server_url('http://localhost:8282/sensorhub')
+                   .with_api_root('api')
+                   .for_resource_type('systems')
+                   .with_params({'id': [YOUR_UID_HERE]})
+                   .build_url_from_base()
+                   .with_request_method('GET')
+                   .build())
+    api_request.params = {'id': [YOUR_UID_HERE]}
+    api_request.make_request()

tests/test_script_full_suite.py

@@ -282,10 +282,10 @@ def test_create_datastreams():
                                                                            fields=[time_schema, bool_schema]))
 
     print(f'Datastream Schema: {datarecord_schema.model_dump_json(exclude_none=True, by_alias=True)}')
-    datastream_body = DatastreamBodyJSON(name="Test Datastream", output_name="Test Output #1", schema=datarecord_schema)
+    datastream_body = DatastreamBodyJSON(name="Test Datastream", output_name="Test Output #1", datastream_schema=datarecord_schema)
     temp_test_json = datastream_body.model_dump_json(exclude_none=True, by_alias=True)
     print(f'Test Datastream JSON: {temp_test_json}')
-    resp = Datastreams.add_datastreams_to_system(server_url, retrieved_systems[0]['id'],
+    resp = Datastreams.add_datastreams_to_system(server_url, retrieved_systems[1]['id'],
                                                  datastream_body.model_dump_json(exclude_none=True, by_alias=True),
                                                  headers=json_headers)
     print(resp)