Fix/minor refactorings (#173)

* rename `model_id` to resolve namespace conflict of fastapi

* enable `valid_url_valid_file` testcase

* enable `valid_url_valid_file` testcase in exception test case runner

* `CHANGELOG.md` updated

* rename `model_id` to `ml_model_id`

* update timeout to solve macOS action failue

Author: AHReccese

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 ### Added
 ### Changed
+- `valid_url_valid_file` testcase added in `test_exceptions.py`
+- `valid_url_valid_file` function in `import_exceptions.py`
+- `StandardPayload` in `RESTServerCommunicator`
 - testcase for LogisticRegressionCV, LogisticRegression
 - `README.md` updated
 - `AUTHORS.md` updated

pymilo/streaming/communicator.py

@@ -114,7 +114,7 @@ def setup_routes(self):
         """Configure endpoints to handle RESTClientCommunicator requests."""
         class StandardPayload(BaseModel):
             client_id: str
-            model_id: str
+            ml_model_id: str
 
         class DownloadPayload(StandardPayload):
             pass
@@ -135,7 +135,7 @@ async def download(request: Request):
             body = await request.json()
             body = self.parse(body)
             payload = DownloadPayload(**body)
-            message = "/download request from client: {} for model: {}".format(payload.client_id, payload.model_id)
+            message = "/download request from client: {} for model: {}".format(payload.client_id, payload.ml_model_id)
             return {
                 "message": message,
                 "payload": self._ps.export_model(),
@@ -146,7 +146,7 @@ async def upload(request: Request):
             body = await request.json()
             body = self.parse(body)
             payload = UploadPayload(**body)
-            message = "/upload request from client: {} for model: {}".format(payload.client_id, payload.model_id)
+            message = "/upload request from client: {} for model: {}".format(payload.client_id, payload.ml_model_id)
             return {
                 "message": message,
                 "payload": self._ps.update_model(payload.model)
@@ -158,7 +158,7 @@ async def attribute_call(request: Request):
             body = self.parse(body)
             payload = AttributeCallPayload(**body)
             message = "/attribute_call request from client: {} for model: {}".format(
-                payload.client_id, payload.model_id)
+                payload.client_id, payload.ml_model_id)
             result = self._ps.execute_model(payload)
             return {
                 "message": message,
@@ -171,7 +171,7 @@ async def attribute_type(request: Request):
             body = self.parse(body)
             payload = AttributeTypePayload(**body)
             message = "/attribute_type request from client: {} for model: {}".format(
-                payload.client_id, payload.model_id)
+                payload.client_id, payload.ml_model_id)
             is_callable, field_value = self._ps.is_callable_attribute(payload)
             return {
                 "message": message,

pymilo/streaming/pymilo_client.py

@@ -45,7 +45,7 @@ def __init__(
         """
         self.model = model
         self.client_id = "0x_client_id"
-        self.model_id = "0x_model_id"
+        self.ml_model_id = "0x_ml_model_id"
         self._mode = mode
         self._compressor = compressor.value
         self._encryptor = DummyEncryptor()
@@ -86,7 +86,7 @@ def download(self):
             self.encrypt_compress(
                 {
                     "client_id": self.client_id,
-                    "model_id": self.model_id,
+                    "ml_model_id": self.ml_model_id,
                 }
             )
         )
@@ -106,7 +106,7 @@ def upload(self):
             self.encrypt_compress(
                 {
                     "client_id": self.client_id,
-                    "model_id": self.model_id,
+                    "ml_model_id": self.ml_model_id,
                     "model": Export(self.model).to_json(),
                 }
             )
@@ -136,7 +136,7 @@ def __getattr__(self, attribute):
                 self.encrypt_compress(
                     {
                         "client_id": self.client_id,
-                        "model_id": self.model_id,
+                        "ml_model_id": self.ml_model_id,
                         "attribute": attribute,
                     }
                 )
@@ -147,7 +147,7 @@ def __getattr__(self, attribute):
             def relayer(*args, **kwargs):
                 payload = {
                     "client_id": self.client_id,
-                    "model_id": self.model_id,
+                    "ml_model_id": self.ml_model_id,
                     'attribute': attribute,
                     'args': args,
                     'kwargs': kwargs,

tests/test_exceptions/import_exceptions.py

@@ -33,7 +33,7 @@ def valid_url_invalid_file():
   except Exception:
     return True
 
-# def valid_url_valid_file():
-#   with pytest.raises(Exception):
-#     url = "https://raw.githubusercontent.com/openscilab/pymilo/main/tests/test_exceptions/valid_jsons/linear_regression.json"
-#     Import(url=url)
+def valid_url_valid_file():
+    url = "https://raw.githubusercontent.com/openscilab/pymilo/main/tests/test_exceptions/valid_jsons/linear_regression.json"
+    _ = Import(url=url).to_model()
+    return True

tests/test_exceptions/test_exceptions.py

@@ -3,14 +3,14 @@
 from export_exceptions import valid_model_invalid_structure_neural_network
 from export_exceptions import valid_model_irrelevant_chain
 
-from import_exceptions import invalid_json, invalid_url, valid_url_invalid_file#, valid_url_valid_file
+from import_exceptions import invalid_json, invalid_url, valid_url_invalid_file, valid_url_valid_file
 
 EXCEPTION_TESTS = {
     'IMPORT': [
         invalid_json,
         invalid_url,
         valid_url_invalid_file,
-        #valid_url_valid_file,
+        valid_url_valid_file,
         ],
     'EXPORT': [
         invalid_model,

tests/test_ml_streaming/test_streaming.py

@@ -27,7 +27,7 @@ def prepare_bare_server(request):
             "--protocol", "REST"
         ],
         )
-    time.sleep(5)
+    time.sleep(10)
     yield (server_proc, compression_method, "REST")
     server_proc.terminate()