[Model Monitoring] Fix querying invocations metric by itself (#5652)

* [Datastore] Fix querying invocations metric by itself [ML-6606](https://iguazio.atlassian.net/browse/ML-6606) * Fix check in system test * Fix the fix * Revert "Fix the fix" This reverts commit 400383d.
mlrun · May 29, 2024 · 8629217 · 8629217
1 parent 4436666
commit 8629217
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/server/api/api/endpoints/model_endpoints.py b/server/api/api/endpoints/model_endpoints.py
@@ -521,16 +521,17 @@ async def get_model_endpoint_monitoring_metrics_values(
                         )
                     )
                 )
-            coroutines.append(
-                run_in_threadpool(
-                    tsdb_connector.read_metrics_data,
-                    endpoint_id=params.endpoint_id,
-                    start=params.start,
-                    end=params.end,
-                    metrics=metrics_without_invocations,
-                    type=type,
+            if metrics_without_invocations:
+                coroutines.append(
+                    run_in_threadpool(
+                        tsdb_connector.read_metrics_data,
+                        endpoint_id=params.endpoint_id,
+                        start=params.start,
+                        end=params.end,
+                        metrics=metrics_without_invocations,
+                        type=type,
+                    )
                 )
-            )
 
     metrics_values = []
     for result in await asyncio.gather(*coroutines):

diff --git a/tests/system/model_monitoring/test_app.py b/tests/system/model_monitoring/test_app.py
@@ -281,7 +281,7 @@ def _test_api_get_metrics(
         if type == "metrics":
             expected_results.add("invocations")
 
-        assert get_app_results == getattr(app_data, type)
+        assert get_app_results == expected_results
         assert app_results_full_names, f"No {type}"
         return app_results_full_names