Merge branch 'part-1'

Author: tipatterson-dev

conSys/__init__.py

@@ -0,0 +1 @@
+

conSys/__pycache__/__init__.cpython-310.pyc

@@ -1,18 +1,37 @@
-from pydantic import BaseModel, HttpUrl
+import requests
+from pydantic import BaseModel, HttpUrl, Field
 
 from conSys.endpoints.endpoints import Endpoint
 from conSys.request_bodies import RequestBody
 
 
 class ConnectedSystemAPIRequest(BaseModel):
-    url: HttpUrl
-    request_body: RequestBody
+    url: HttpUrl = Field(None)
+    body: RequestBody = Field(default_factory=RequestBody)
+    params: dict = Field(None)
+    request_method: str = Field('GET')
+    headers: dict = Field(None)
+
+    def make_request(self):
+        match self.request_method:
+            case 'GET':
+                return requests.get(self.url, params=self.body, headers=self.headers)
+            case 'POST':
+                return self.post_request()
+            case 'PUT':
+                return self.put_request()
+            case 'DELETE':
+                return self.delete_request()
+            case _:
+                raise ValueError('Invalid request method')
 
 
 class ConnectedSystemsRequestBuilder(BaseModel):
-    api_request: ConnectedSystemAPIRequest
-    base_url: HttpUrl
-    endpoint: Endpoint
+    api_request: ConnectedSystemAPIRequest = Field(default_factory=ConnectedSystemAPIRequest)
+    base_url: HttpUrl = None
+    endpoint: Endpoint = Field(default_factory=Endpoint)
+
+
 
     def with_api_url(self, url: HttpUrl):
         self.api_request.url = url
@@ -57,7 +76,16 @@ def with_secondary_resource_id(self, resource_id: str):
         return self
 
     def with_request_body(self, request_body: RequestBody):
-        self.api_request.request_body = request_body
+        self.api_request.body = request_body
+        return self
+
+    def with_request_method(self, request_method: str):
+        self.api_request.request_method = request_method
+        return self
+
+    def with_headers(self, headers: dict = None):
+        # TODO: ensure headers can default if excluded
+        self.api_request.headers = headers
         return self
 
     def build(self):

conSys/__pycache__/con_sys_api.cpython-310.pyc

@@ -1,18 +1,18 @@
 from enum import Enum
 
 import requests
-import websockets
-from pydantic import BaseModel
+# import websockets
+from pydantic import BaseModel, Field
 
 from conSys.constants import APITerms
 
 
 class Endpoint(BaseModel):
     api_root: str = APITerms.API.value
-    base_resource: APITerms
-    resource_id: str = None
-    sub_component: APITerms = None
-    secondary_resource_id: str = None
+    base_resource: APITerms = Field(None)
+    resource_id: str = Field(None)
+    sub_component: APITerms = Field(None)
+    secondary_resource_id: str = Field(None)
 
     def create_endpoint(self):
         # TODO: Handle insertion of  "/" in the right places
@@ -99,19 +99,19 @@ def handle_request(url, params=None, content_json=None, method='get', response_h
         return r
 
 
-async def handle_ws(url, params=None, json_data=None, method='get', response_handler=None):
-    """
-    Handles a request to the API. Functionality is limited to receiving observations for now, but will be improved in
-    future versions.
-    :param url: The URL to make the request to
-    :param params: The parameters to send with the request
-    :param json_data: The JSON to send with the request
-    :param method: The method to use for the request
-    :param response_handler: callback function to handle the response msg
-    :return: The response from the API
-    """
-
-    async with websockets.connect(url) as ws:
-        while True:
-            msg = await ws.recv()
-            response_handler(msg)
+# async def handle_ws(url, params=None, json_data=None, method='get', response_handler=None):
+#     """
+#     Handles a request to the API. Functionality is limited to receiving observations for now, but will be improved in
+#     future versions.
+#     :param url: The URL to make the request to
+#     :param params: The parameters to send with the request
+#     :param json_data: The JSON to send with the request
+#     :param method: The method to use for the request
+#     :param response_handler: callback function to handle the response msg
+#     :return: The response from the API
+#     """
+#
+#     async with websockets.connect(url) as ws:
+#         while True:
+#             msg = await ws.recv()
+#             response_handler(msg)