frogml-core 0.0.101__py3-none-any.whl → 0.0.102__py3-none-any.whl

frogml_core/__init__.py

@@ -1,7 +1,7 @@
 """Top-level package for frogml."""
 
 __author__ = "jfrog"
-__version__ = "0.0.101"
+__version__ = "0.0.102"
 
 from frogml_core.inner.di_configuration import wire_dependencies
 from frogml_core.model.model_version_tracking import (  # noqa: F401,E501

frogml_core/clients/analytics/client.py

@@ -1,8 +1,11 @@
 from datetime import timedelta
 from time import sleep, time
+from typing import Optional
 
-from dependency_injector.wiring import Provide
-
+import grpc
+from frogml_core.clients.location_discovery import LocationDiscoveryClient
+from frogml_core.inner.di_configuration import FrogmlContainer
+from frogml_core.inner.tool.grpc.grpc_tools import create_grpc_channel
 from frogml_proto.qwak.analytics.analytics_pb2 import (
     QueryResultDownloadURLParams,
     QueryStatus,
@@ -16,7 +19,6 @@ from frogml_proto.qwak.analytics.analytics_service_pb2 import (
 from frogml_proto.qwak.analytics.analytics_service_pb2_grpc import (
     AnalyticsQueryServiceStub,
 )
-from frogml_core.inner.di_configuration import FrogmlContainer
 
 
 class AnalyticsEngineError(RuntimeError):
@@ -27,8 +29,10 @@ class AnalyticsEngineError(RuntimeError):
 
 
 class AnalyticsEngineClient:
-    def __init__(self, grpc_channel=Provide[FrogmlContainer.core_grpc_channel]):
-        self.grpc_client = AnalyticsQueryServiceStub(grpc_channel)
+    def __init__(
+        self, grpc_channel: Optional[FrogmlContainer.core_grpc_channel] = None
+    ):
+        self.grpc_client = self._create_grpc_client(grpc_channel)
 
     def get_analytics_data(self, query: str, timeout: timedelta = None) -> str:
         """
@@ -80,3 +84,25 @@ class AnalyticsEngineClient:
         request = GetQueryResultDownloadURLRequest(params=request_params)
         response = self.grpc_client.GetQueryResultDownloadURL(request)
         return response.download_url
+
+    def _create_grpc_client(
+        self, grpc_channel: Optional[grpc.Channel] = None
+    ) -> AnalyticsQueryServiceStub:
+        if grpc_channel:
+            return AnalyticsQueryServiceStub(grpc_channel)
+
+        channel = create_grpc_channel(
+            url=self._get_analytics_engine_url(),
+            status_for_retry=(
+                grpc.StatusCode.UNAVAILABLE,
+                grpc.StatusCode.CANCELLED,
+            ),
+        )
+        return AnalyticsQueryServiceStub(channel)
+
+    @staticmethod
+    def _get_analytics_engine_url() -> str:
+        """
+        Fetches the analytics engine service URL from the LocationDiscoveryService.
+        """
+        return LocationDiscoveryClient().get_analytics_engine().service_url

{frogml_core-0.0.101.dist-info → frogml_core-0.0.102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.101
+Version: 0.0.102
 Summary: frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model

{frogml_core-0.0.101.dist-info → frogml_core-0.0.102.dist-info}/RECORD

@@ -1,4 +1,4 @@
-frogml_core/__init__.py,sha256=4z0TII-k4c2lgF2Z_V7DYetUqOIU-Q_S08zc8UHtPAI,778
+frogml_core/__init__.py,sha256=DnKYcSHTL3k9v5mU-XujGUZRHWr0VFbcoD43pkDhdXY,778
 frogml_core/automations/__init__.py,sha256=j2gD15MN-xVWhI5rAFsDwhL0CIyICLNT0scXsKvNBkU,1547
 frogml_core/automations/automation_executions.py,sha256=xpOb9Dq8gPPGNQDJTvBBZbNz4woZDRZY0HqnLSu7pwU,3230
 frogml_core/automations/automations.py,sha256=GKEQyQMi8sxX5oZn62PaxPi0zD8IaJRjBkhczRJxHNs,13070
@@ -26,7 +26,7 @@ frogml_core/clients/alerts_registry/__init__.py,sha256=RszIZ4jLzCLapZQ3iQt0lTWPt
 frogml_core/clients/alerts_registry/channel.py,sha256=7NphgqqpcAsV31D_gsVJhm1ENLYaWWJAWsD-BRLzATQ,4058
 frogml_core/clients/alerts_registry/client.py,sha256=Ziy2qWjXwcbVkWQymgbU7faJ_eRmEwN6fPLB62lR4hA,5406
 frogml_core/clients/analytics/__init__.py,sha256=bSerqCrPyfBWnKDHT0ncofKUU-4NjmQZFZ2Uf66a4eA,42
-frogml_core/clients/analytics/client.py,sha256=jzkrczNpOlGpn80uVDrbrfoeFOcBjzfsSkqnQpEJsWI,3108
+frogml_core/clients/analytics/client.py,sha256=gdRT8-NT2YbRCbdy23IVWZzLAoEd0sZ_yAjWu_CfCL4,4007
 frogml_core/clients/audience/__init__.py,sha256=WMgEXjWSmDFUC3A3L8Fe3OoPv2SrQNXY-1OPQpuqGHM,35
 frogml_core/clients/audience/client.py,sha256=FIacuza9skP81Pj2gNU1mzafa6aXcubv3R1_dfcDus4,2125
 frogml_core/clients/automation_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1114,7 +1114,7 @@ frogml_services_mock/mocks/workspace_manager_service_mock.py,sha256=WbOiWgOyr-xT
 frogml_services_mock/services_mock.py,sha256=sgKgwhu2W0YOHtzil8x7f1znK_sZr_i27XSeiF4xqVE,21200
 frogml_services_mock/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 frogml_services_mock/utils/service_utils.py,sha256=ZlB0CnB1J6oBn6_m7fQO2U8tKoboHdUa6ljjkRMYNXU,265
-frogml_storage/__init__.py,sha256=TyaYK2YyDFzWjL2Sm55Lwi_AIuIz9SMdMXLntdeh95o,24
+frogml_storage/__init__.py,sha256=NwgaP3r0RQBB6vGkoVP2n9r1kcxM5G7WposnBkzezhs,24
 frogml_storage/_environment.py,sha256=zuzOJBtBwFaguwn_JkKjfhXStZoustgP30KzOP3mYv8,707
 frogml_storage/artifactory/__init__.py,sha256=C02rcm7kqsZBVA6c6Gztxamj96hn8Aj6BuzYWFRmWbQ,71
 frogml_storage/artifactory/_artifactory_api.py,sha256=Oz0HOpQPSNwWIVAy94UJUyPhLetc7sdZjoTfSXtrFug,11200
@@ -1153,6 +1153,6 @@ frogml_storage/utils/__init__.py,sha256=HQUWfuGUIPZY7kfS795TRW8BQ4WmNqrNjS7lUrbx
 frogml_storage/utils/_input_checks_utility.py,sha256=CFiJOdTBS9piJMtR3lemEz27wZcQ6_-7XESu8iy-mrw,3221
 frogml_storage/utils/_storage_utils.py,sha256=HB2g7uY5A3b33yIcAUM1OjHb5jWsnpESsiDrEviQwrI,366
 frogml_storage/utils/_url_utils.py,sha256=NUEfz9Fp1iE8b676-A5wrMlSTsJVRKrUhcUItOFAJD8,821
-frogml_core-0.0.101.dist-info/METADATA,sha256=IyP9PUbLkhZ6VGpbPHteLlwCXR7BhggClvcg40TEG8o,14976
-frogml_core-0.0.101.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-frogml_core-0.0.101.dist-info/RECORD,,
+frogml_core-0.0.102.dist-info/METADATA,sha256=OBtK03EexmdzE2wtcs9P9qBuvExHj--bMsnp7KIGW3o,14976
+frogml_core-0.0.102.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+frogml_core-0.0.102.dist-info/RECORD,,

frogml_storage/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.101"
+__version__ = "0.0.102"