Fix issues found in System testing

Author: tipatterson-dev

conSys/__init__.py

@@ -1 +1,22 @@
+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 .endpoints.endpoints import Endpoint
+
+from .request_bodies import RequestBody, SmlJSONBody, GeoJSONBody
+
+from .querymodel import QueryModel
+from .constants import APITerms, SystemTypes, ObservationFormat
+from .utilities import model_utils

conSys/__pycache__/__init__.cpython-310.pyc

@@ -2,26 +2,27 @@
 from pydantic import BaseModel, HttpUrl, Field
 
 from conSys.endpoints.endpoints import Endpoint
-from conSys.request_bodies import RequestBody
+from conSys.request_wrappers import post_request, put_request, get_request, delete_request
 
 
 class ConnectedSystemAPIRequest(BaseModel):
     url: HttpUrl = Field(None)
-    body: RequestBody = Field(default_factory=RequestBody)
+    body: dict = Field(None)
     params: dict = Field(None)
     request_method: str = Field('GET')
     headers: dict = Field(None)
+    auth: tuple = Field(None)
 
     def make_request(self):
         match self.request_method:
             case 'GET':
-                return requests.get(self.url, params=self.body, headers=self.headers)
+                return get_request(self.url, self.params, self.headers, self.auth)
             case 'POST':
-                return self.post_request()
+                return post_request(self.url, self.body, self.headers, self.auth)
             case 'PUT':
-                return self.put_request()
+                return put_request(self.url, self.body, self.headers, self.auth)
             case 'DELETE':
-                return self.delete_request()
+                return delete_request(self.url, self.params, self.headers, self.auth)
             case _:
                 raise ValueError('Invalid request method')
 
@@ -31,8 +32,6 @@ class ConnectedSystemsRequestBuilder(BaseModel):
     base_url: HttpUrl = None
     endpoint: Endpoint = Field(default_factory=Endpoint)
 
-
-
     def with_api_url(self, url: HttpUrl):
         self.api_request.url = url
         return self
@@ -75,7 +74,7 @@ def with_secondary_resource_id(self, resource_id: str):
         self.endpoint.secondary_resource_id = resource_id
         return self
 
-    def with_request_body(self, request_body: RequestBody):
+    def with_request_body(self, request_body: str):
         self.api_request.body = request_body
         return self
 
@@ -88,6 +87,10 @@ def with_headers(self, headers: dict = None):
         self.api_request.headers = headers
         return self
 
+    def with_auth(self, uname: str, pword: str):
+        self.api_request.auth = (uname, pword)
+        return self
+
     def build(self):
         # convert endpoint to HttpUrl
         return self.api_request