mlrun 1.7.0rc6__py3-none-any.whl → 1.7.0rc9__py3-none-any.whl

mlrun/serving/states.py

@@ -14,7 +14,6 @@
 
 __all__ = ["TaskStep", "RouterStep", "RootFlowStep", "ErrorStep"]
 
-import asyncio
 import os
 import pathlib
 import traceback
@@ -591,7 +590,7 @@ class RouterStep(TaskStep):
 
     kind = "router"
     default_shape = "doubleoctagon"
-    _dict_fields = _task_step_fields + ["routes"]
+    _dict_fields = _task_step_fields + ["routes", "engine"]
     _default_class = "mlrun.serving.ModelRouter"
 
     def __init__(
@@ -604,6 +603,7 @@ class RouterStep(TaskStep):
         function: str = None,
         input_path: str = None,
         result_path: str = None,
+        engine: str = None,
     ):
         super().__init__(
             class_name,
@@ -616,6 +616,8 @@ class RouterStep(TaskStep):
         )
         self._routes: ObjectDict = None
         self.routes = routes
+        self.engine = engine
+        self._controller = None
 
     def get_children(self):
         """get child steps (routes)"""
@@ -685,6 +687,33 @@ class RouterStep(TaskStep):
         self._set_error_handler()
         self._post_init(mode)
 
+        if self.engine == "async":
+            self._build_async_flow()
+            self._run_async_flow()
+
+    def _build_async_flow(self):
+        """initialize and build the async/storey DAG"""
+
+        self.respond()
+        source, self._wait_for_result = _init_async_objects(self.context, [self])
+        source.to(self.async_object)
+
+        self._async_flow = source
+
+    def _run_async_flow(self):
+        self._controller = self._async_flow.run()
+
+    def run(self, event, *args, **kwargs):
+        if self._controller:
+            # async flow (using storey)
+            event._awaitable_result = None
+            resp = self._controller.emit(
+                event, return_awaitable_result=self._wait_for_result
+            )
+            return resp.await_result()
+
+        return super().run(event, *args, **kwargs)
+
     def __getitem__(self, name):
         return self._routes[name]
 
@@ -1205,18 +1234,9 @@ class FlowStep(BaseStep):
         """wait for completion of run in async flows"""
 
         if self._controller:
-            if asyncio.iscoroutinefunction(self._controller.await_termination):
-
-                async def terminate_and_await_termination():
-                    if hasattr(self._controller, "terminate"):
-                        await self._controller.terminate()
-                    return await self._controller.await_termination()
-
-                return terminate_and_await_termination()
-            else:
-                if hasattr(self._controller, "terminate"):
-                    self._controller.terminate()
-                return self._controller.await_termination()
+            if hasattr(self._controller, "terminate"):
+                self._controller.terminate()
+            return self._controller.await_termination()
 
     def plot(self, filename=None, format=None, source=None, targets=None, **kw):
         """plot/save graph using graphviz
@@ -1504,21 +1524,18 @@ def _init_async_objects(context, steps):
                     endpoint = None
                     options = {}
                     options.update(step.options)
-                    kafka_bootstrap_servers = options.pop(
-                        "kafka_bootstrap_servers", None
-                    )
-                    if stream_path.startswith("kafka://") or kafka_bootstrap_servers:
-                        topic, bootstrap_servers = parse_kafka_url(
-                            stream_path, kafka_bootstrap_servers
-                        )
+                    kafka_brokers = options.pop("kafka_brokers", None)
+                    if stream_path.startswith("kafka://") or kafka_brokers:
+                        topic, brokers = parse_kafka_url(stream_path, kafka_brokers)
 
                         kafka_producer_options = options.pop(
-                            "kafka_producer_options", None
+                            "kafka_producer_options",
+                            options.pop("kafka_bootstrap_servers", None),
                         )
 
                         step._async_object = storey.KafkaTarget(
                             topic=topic,
-                            bootstrap_servers=bootstrap_servers,
+                            brokers=brokers,
                             producer_options=kafka_producer_options,
                             context=context,
                             **options,

mlrun/serving/v2_serving.py

@@ -21,6 +21,7 @@ import mlrun.common.model_monitoring
 import mlrun.common.schemas.model_monitoring
 from mlrun.artifacts import ModelArtifact  # noqa: F401
 from mlrun.config import config
+from mlrun.errors import err_to_str
 from mlrun.utils import logger, now_date
 
 from ..common.helpers import parse_versioned_object_uri
@@ -523,7 +524,7 @@ def _init_endpoint_record(
             graph_server.function_uri
         )
     except Exception as e:
-        logger.error("Failed to parse function URI", exc=e)
+        logger.error("Failed to parse function URI", exc=err_to_str(e))
         return None
 
     # Generating version model value based on the model name and model version
@@ -576,9 +577,9 @@ def _init_endpoint_record(
             )
 
         except Exception as e:
-            logger.error("Failed to create endpoint record", exc=e)
+            logger.error("Failed to create endpoint record", exc=err_to_str(e))
 
     except Exception as e:
-        logger.error("Failed to retrieve model endpoint object", exc=e)
+        logger.error("Failed to retrieve model endpoint object", exc=err_to_str(e))
 
     return uid

mlrun/utils/helpers.py

@@ -1405,6 +1405,18 @@ def as_number(field_name, field_value):
 
 
 def filter_warnings(action, category):
+    """
+    Decorator to filter warnings
+
+    Example::
+        @filter_warnings("ignore", FutureWarning)
+        def my_function():
+            pass
+
+    :param action:      one of "error", "ignore", "always", "default", "module", or "once"
+    :param category:    a class that the warning must be a subclass of
+    """
+
     def decorator(function):
         def wrapper(*args, **kwargs):
             # context manager that copies and, upon exit, restores the warnings filter and the showwarning() function.
@@ -1562,3 +1574,25 @@ def is_safe_path(base, filepath, is_symlink=False):
         os.path.abspath(filepath) if not is_symlink else os.path.realpath(filepath)
     )
     return base == os.path.commonpath((base, resolved_filepath))
+
+
+def get_serving_spec():
+    data = None
+
+    # we will have the serving spec in either mounted config map
+    # or env depending on the size of the spec and configuration
+
+    try:
+        with open(mlrun.common.constants.MLRUN_SERVING_SPEC_PATH) as f:
+            data = f.read()
+    except FileNotFoundError:
+        pass
+
+    if data is None:
+        data = os.environ.get("SERVING_SPEC_ENV", "")
+        if not data:
+            raise mlrun.errors.MLRunInvalidArgumentError(
+                "Failed to find serving spec in env var or config file"
+            )
+    spec = json.loads(data)
+    return spec

mlrun/utils/http.py

@@ -122,7 +122,7 @@ class HTTPSessionWithRetry(requests.Session):
 
                 self._logger.warning(
                     "Error during request handling, retrying",
-                    exc=str(exc),
+                    exc=err_to_str(exc),
                     retry_count=retry_count,
                     url=url,
                     method=method,

mlrun/utils/retryer.py

@@ -138,6 +138,7 @@ class Retryer:
         except mlrun.errors.MLRunFatalFailureError as exc:
             raise exc.original_exception
         except Exception as exc:
+            self.last_exception = exc
             return (
                 None,
                 self.last_exception,

mlrun/utils/version/version.json

@@ -1,4 +1,4 @@
 {
-  "git_commit": "cbfd1ee5f41bee97ff90efbce14bac0a56b58dce",
-  "version": "1.7.0-rc6"
+  "git_commit": "3396f9ef4c278411ca6227b1792ff7df20005a42",
+  "version": "1.7.0-rc9"
 }

{mlrun-1.7.0rc6.dist-info → mlrun-1.7.0rc9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlrun
-Version: 1.7.0rc6
+Version: 1.7.0rc9
 Summary: Tracking and config of machine learning runs
 Home-page: https://github.com/mlrun/mlrun
 Author: Yaron Haviv
@@ -36,21 +36,24 @@ Requires-Dist: pyarrow <15,>=10.0
 Requires-Dist: pyyaml ~=5.1
 Requires-Dist: requests ~=2.31
 Requires-Dist: tabulate ~=0.8.6
-Requires-Dist: v3io ~=0.6.2
-Requires-Dist: pydantic >=1.10.8,~=1.10
+Requires-Dist: v3io ~=0.6.4
+Requires-Dist: pydantic <1.10.15,>=1.10.8
 Requires-Dist: mergedeep ~=1.3
 Requires-Dist: v3io-frames ~=0.10.12
 Requires-Dist: semver ~=3.0
 Requires-Dist: dependency-injector ~=4.41
-Requires-Dist: fsspec ==2023.9.2
+Requires-Dist: fsspec <2024.4,>=2023.9.2
 Requires-Dist: v3iofs ~=0.1.17
-Requires-Dist: storey ~=1.7.5
+Requires-Dist: storey ~=1.7.7
 Requires-Dist: inflection ~=0.5.0
 Requires-Dist: python-dotenv ~=0.17.0
 Requires-Dist: setuptools ~=69.1
 Requires-Dist: deprecated ~=1.2
 Requires-Dist: jinja2 >=3.1.3,~=3.1
-Requires-Dist: orjson ~=3.9
+Requires-Dist: orjson <4,>=3.9.15
+Provides-Extra: alibaba-oss
+Requires-Dist: ossfs ==2023.12.0 ; extra == 'alibaba-oss'
+Requires-Dist: oss2 ==2.18.1 ; extra == 'alibaba-oss'
 Provides-Extra: all
 Requires-Dist: adlfs ==2023.9.0 ; extra == 'all'
 Requires-Dist: aiobotocore <2.8,>=2.5.0 ; extra == 'all'
@@ -63,7 +66,7 @@ Requires-Dist: boto3 <1.29.0,>=1.28.0 ; extra == 'all'
 Requires-Dist: dask ~=2023.9.0 ; extra == 'all'
 Requires-Dist: databricks-sdk ~=0.13.0 ; extra == 'all'
 Requires-Dist: distributed ~=2023.9.0 ; extra == 'all'
-Requires-Dist: gcsfs ==2023.9.2 ; extra == 'all'
+Requires-Dist: gcsfs <2024.4,>=2023.9.2 ; extra == 'all'
 Requires-Dist: google-cloud-bigquery[bqstorage,pandas] ==3.14.1 ; extra == 'all'
 Requires-Dist: google-cloud-storage ==2.14.0 ; extra == 'all'
 Requires-Dist: google-cloud ==0.34 ; extra == 'all'
@@ -71,17 +74,19 @@ Requires-Dist: graphviz ~=0.20.0 ; extra == 'all'
 Requires-Dist: kafka-python ~=2.0 ; extra == 'all'
 Requires-Dist: mlflow ~=2.8 ; extra == 'all'
 Requires-Dist: msrest ~=0.6.21 ; extra == 'all'
+Requires-Dist: oss2 ==2.18.1 ; extra == 'all'
+Requires-Dist: ossfs ==2023.12.0 ; extra == 'all'
 Requires-Dist: plotly <5.12.0,~=5.4 ; extra == 'all'
 Requires-Dist: pyopenssl >=23 ; extra == 'all'
 Requires-Dist: redis ~=4.3 ; extra == 'all'
-Requires-Dist: s3fs ==2023.9.2 ; extra == 'all'
+Requires-Dist: s3fs <2024.4,>=2023.9.2 ; extra == 'all'
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'all'
 Provides-Extra: api
 Requires-Dist: uvicorn ~=0.27.1 ; extra == 'api'
 Requires-Dist: dask-kubernetes ~=0.11.0 ; extra == 'api'
 Requires-Dist: apscheduler <4,>=3.10.3 ; extra == 'api'
 Requires-Dist: objgraph ~=3.6 ; extra == 'api'
-Requires-Dist: igz-mgmt ~=0.1.0 ; extra == 'api'
+Requires-Dist: igz-mgmt ~=0.1.3 ; extra == 'api'
 Requires-Dist: humanfriendly ~=10.0 ; extra == 'api'
 Requires-Dist: fastapi ~=0.110.0 ; extra == 'api'
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'api'
@@ -110,16 +115,18 @@ Requires-Dist: boto3 <1.29.0,>=1.28.0 ; extra == 'complete'
 Requires-Dist: dask ~=2023.9.0 ; extra == 'complete'
 Requires-Dist: databricks-sdk ~=0.13.0 ; extra == 'complete'
 Requires-Dist: distributed ~=2023.9.0 ; extra == 'complete'
-Requires-Dist: gcsfs ==2023.9.2 ; extra == 'complete'
+Requires-Dist: gcsfs <2024.4,>=2023.9.2 ; extra == 'complete'
 Requires-Dist: google-cloud-bigquery[bqstorage,pandas] ==3.14.1 ; extra == 'complete'
 Requires-Dist: graphviz ~=0.20.0 ; extra == 'complete'
 Requires-Dist: kafka-python ~=2.0 ; extra == 'complete'
 Requires-Dist: mlflow ~=2.8 ; extra == 'complete'
 Requires-Dist: msrest ~=0.6.21 ; extra == 'complete'
+Requires-Dist: oss2 ==2.18.1 ; extra == 'complete'
+Requires-Dist: ossfs ==2023.12.0 ; extra == 'complete'
 Requires-Dist: plotly <5.12.0,~=5.4 ; extra == 'complete'
 Requires-Dist: pyopenssl >=23 ; extra == 'complete'
 Requires-Dist: redis ~=4.3 ; extra == 'complete'
-Requires-Dist: s3fs ==2023.9.2 ; extra == 'complete'
+Requires-Dist: s3fs <2024.4,>=2023.9.2 ; extra == 'complete'
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'complete'
 Provides-Extra: complete-api
 Requires-Dist: adlfs ==2023.9.0 ; extra == 'complete-api'
@@ -136,20 +143,22 @@ Requires-Dist: dask ~=2023.9.0 ; extra == 'complete-api'
 Requires-Dist: databricks-sdk ~=0.13.0 ; extra == 'complete-api'
 Requires-Dist: distributed ~=2023.9.0 ; extra == 'complete-api'
 Requires-Dist: fastapi ~=0.110.0 ; extra == 'complete-api'
-Requires-Dist: gcsfs ==2023.9.2 ; extra == 'complete-api'
+Requires-Dist: gcsfs <2024.4,>=2023.9.2 ; extra == 'complete-api'
 Requires-Dist: google-cloud-bigquery[bqstorage,pandas] ==3.14.1 ; extra == 'complete-api'
 Requires-Dist: graphviz ~=0.20.0 ; extra == 'complete-api'
 Requires-Dist: humanfriendly ~=10.0 ; extra == 'complete-api'
-Requires-Dist: igz-mgmt ~=0.1.0 ; extra == 'complete-api'
+Requires-Dist: igz-mgmt ~=0.1.3 ; extra == 'complete-api'
 Requires-Dist: kafka-python ~=2.0 ; extra == 'complete-api'
 Requires-Dist: mlflow ~=2.8 ; extra == 'complete-api'
 Requires-Dist: msrest ~=0.6.21 ; extra == 'complete-api'
 Requires-Dist: objgraph ~=3.6 ; extra == 'complete-api'
+Requires-Dist: oss2 ==2.18.1 ; extra == 'complete-api'
+Requires-Dist: ossfs ==2023.12.0 ; extra == 'complete-api'
 Requires-Dist: plotly <5.12.0,~=5.4 ; extra == 'complete-api'
 Requires-Dist: pymysql ~=1.0 ; extra == 'complete-api'
 Requires-Dist: pyopenssl >=23 ; extra == 'complete-api'
 Requires-Dist: redis ~=4.3 ; extra == 'complete-api'
-Requires-Dist: s3fs ==2023.9.2 ; extra == 'complete-api'
+Requires-Dist: s3fs <2024.4,>=2023.9.2 ; extra == 'complete-api'
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'complete-api'
 Requires-Dist: timelength ~=1.1 ; extra == 'complete-api'
 Requires-Dist: uvicorn ~=0.27.1 ; extra == 'complete-api'
@@ -165,7 +174,7 @@ Requires-Dist: google-cloud ==0.34 ; extra == 'google-cloud'
 Provides-Extra: google-cloud-bigquery
 Requires-Dist: google-cloud-bigquery[bqstorage,pandas] ==3.14.1 ; extra == 'google-cloud-bigquery'
 Provides-Extra: google-cloud-storage
-Requires-Dist: gcsfs ==2023.9.2 ; extra == 'google-cloud-storage'
+Requires-Dist: gcsfs <2024.4,>=2023.9.2 ; extra == 'google-cloud-storage'
 Provides-Extra: graphviz
 Requires-Dist: graphviz ~=0.20.0 ; extra == 'graphviz'
 Provides-Extra: kafka
@@ -180,7 +189,7 @@ Requires-Dist: redis ~=4.3 ; extra == 'redis'
 Provides-Extra: s3
 Requires-Dist: boto3 <1.29.0,>=1.28.0 ; extra == 's3'
 Requires-Dist: aiobotocore <2.8,>=2.5.0 ; extra == 's3'
-Requires-Dist: s3fs ==2023.9.2 ; extra == 's3'
+Requires-Dist: s3fs <2024.4,>=2023.9.2 ; extra == 's3'
 Provides-Extra: sqlalchemy
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'sqlalchemy'