Merge pull request #75 from PrivateAIM/hub-0.8.17

Update to Hub 0.8.17

Author: pbrassel

.env.test

@@ -7,4 +7,4 @@ PYTEST_ADMIN_PASSWORD=start123
 PYTEST_DEFAULT_MASTER_IMAGE=python/base
 PYTEST_ASYNC_MAX_RETRIES=5
 PYTEST_ASYNC_RETRY_DELAY_MILLIS=500
-PYTEST_HUB_VERSION=0.8.15
+PYTEST_HUB_VERSION=0.8.17

flame_hub/_core_client.py

@@ -298,10 +298,10 @@ class UpdateAnalysisNode(BaseModel):
 
 class CreateAnalysisNodeLog(BaseModel):
     analysis_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)]
-    node_id: uuid.UUID
+    node_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)]
     code: str | None
-    status: str
-    message: str | None
+    status: str | None
+    message: str
     level: LogLevel
 
 
@@ -641,22 +641,25 @@ def create_analysis_node_log(
         analysis_id: Analysis | uuid.UUID | str,
         node_id: Node | uuid.UUID | str,
         level: LogLevel,
-        status: str,
+        message: str,
+        status: str = None,
         code: str = None,
-        message: str = None,
-    ) -> Log:
-        return self._create_resource(
-            Log,
-            CreateAnalysisNodeLog(
-                analysis_id=obtain_uuid_from(analysis_id),
-                node_id=obtain_uuid_from(node_id),
-                code=code,
-                status=status,
-                message=message,
-                level=level,
-            ),
-            "analysis-node-logs",
-        )
+    ) -> None:
+        """Note that this method returns :any:`None` since the response does not contain the log resource."""
+        # TODO: This method should also use _create_resource() from the base client. Therefore creating analysis node
+        # TODO: logs have to return a status code of 201 and the response has to contain the log resource itself.
+        resource = CreateAnalysisNodeLog(
+            analysis_id=analysis_id,
+            node_id=node_id,
+            code=code,
+            status=status,
+            message=message,
+            level=level,
+        )
+        r = self._client.post("analysis-node-logs", json=resource.model_dump(mode="json"))
+        if r.status_code != httpx.codes.ACCEPTED.value:
+            raise new_hub_api_error_from_response(r)
+        return None
 
     def delete_analysis_node_logs(self, analysis_id: Analysis | uuid.UUID | str, node_id: Node | uuid.UUID | str):
         r = self._client.delete(

tests/test_core.py

@@ -190,7 +190,6 @@ def configured_analysis(core_client, registry, analysis, master_realm, analysis_
     return analysis
 
 
-# TODO: Make it possible to create analysis logs in the current test deployment.
 @pytest.fixture()
 def analysis_log(core_client, configured_analysis):
     core_client.send_analysis_command(configured_analysis, "buildStart")
@@ -203,17 +202,6 @@ def _check_analysis_logs_present():
     return core_client.find_analysis_logs(filter={"analysis_id": configured_analysis.id})[0]
 
 
-@pytest.fixture()
-def analysis_node_log(core_client, analysis_node):
-    new_analysis_node_log = core_client.create_analysis_node_log(
-        analysis_node.analysis_id, analysis_node.node_id, level="info", status="started"
-    )
-    yield new_analysis_node_log
-    core_client.delete_analysis_node_logs(
-        analysis_id=new_analysis_node_log.labels["analysis_id"], node_id=new_analysis_node_log.labels["node_id"]
-    )
-
-
 @pytest.fixture()
 def registry(core_client):
     new_registry = core_client.create_registry(
@@ -423,14 +411,13 @@ def test_build_analysis(core_client, configured_analysis):
     assert core_client.send_analysis_command(configured_analysis.id, command="buildStop").build_status == "stopping"
 
 
-@pytest.mark.xfail(reason="It is not possible to create analysis logs in the current test deployment.")
 def test_build_status_analysis(core_client, configured_analysis):
     core_client.send_analysis_command(configured_analysis.id, command="buildStart")
     core_client.send_analysis_command(configured_analysis.id, command="buildStatus")
 
     def _check_checking_event_in_logs():
         logs = core_client.find_analysis_logs(filter={"analysis_id": configured_analysis.id})
-        assert "checking" in [log.event for log in logs]
+        assert "checking" in [log.labels.get("event", None) for log in logs]
 
     assert_eventually(_check_checking_event_in_logs)
 
@@ -472,13 +459,31 @@ def test_get_analysis_node_not_found(core_client):
     assert core_client.get_analysis_node(next_uuid()) is None
 
 
-def test_find_analysis_node_logs(core_client, analysis_node_log):
-    # "node_id" and "analysis_id" have to be specified to filter for analysis node logs.
-    analysis_node_logs_find = core_client.find_analysis_node_logs(
-        filter={"node_id": analysis_node_log.labels["node_id"], "analysis_id": analysis_node_log.labels["analysis_id"]}
+def test_analysis_node_logs(core_client, analysis_node):
+    core_client.create_analysis_node_log(
+        analysis_id=analysis_node.analysis_id, node_id=analysis_node.node_id, level="info", message="test"
     )
 
-    assert analysis_node_log.time in [log.time for log in analysis_node_logs_find]
+    def _check_analysis_node_logs_present():
+        assert (
+            len(
+                core_client.find_analysis_node_logs(
+                    filter={"analysis_id": analysis_node.analysis_id, "node_id": analysis_node.node_id}
+                )
+            )
+            == 1
+        )
+
+    assert_eventually(_check_analysis_node_logs_present)
+
+    # TODO: Deleting analysis node logs raises am error in the hub.
+    # core_client.delete_analysis_node_logs(
+    #    analysis_id=analysis_node.analysis_id, node_id=analysis_node.node_id
+    # )
+
+    # assert len(core_client.find_analysis_node_logs(
+    #    filter={"analysis_id": analysis_node.analysis_id, "node_id": analysis_node.node_id}
+    # )) == 0
 
 
 def test_get_analysis_bucket(core_client, analysis_buckets, analysis_bucket_includables):
@@ -632,7 +637,7 @@ def test_update_registry_project(core_client, registry_project):
     assert new_registry_project.name == new_name
 
 
-@pytest.mark.xfail(reason="It is not possible to create analysis logs in the current test deployment.")
+@pytest.mark.xfail(reason="Bug in Hub, see https://github.com/PrivateAIM/hub/issues/1181.")
 def test_delete_analysis_logs(core_client, analysis_log):
     core_client.delete_analysis_logs(analysis_id=analysis_log.labels["analysis_id"])