frogml-core 0.0.120__py3-none-any.whl → 0.0.121__py3-none-any.whl

core/clients/logging_client/client.py

@@ -1,7 +1,5 @@
 from typing import Optional
 
-from grpc import RpcError
-
 from frogml._proto.qwak.logging.log_filter_pb2 import LogText, SearchFilter
 from frogml._proto.qwak.logging.log_reader_service_pb2 import (
     ReadLogsRequest,
@@ -17,6 +15,7 @@ from frogml._proto.qwak.logging.log_source_pb2 import (
 from frogml.core.clients.administration.eco_system.client import EcosystemClient
 from frogml.core.exceptions import FrogmlException
 from frogml.core.inner.tool.grpc.grpc_tools import create_grpc_channel
+from frogml.core.inner.tool.grpc.grpc_try_wrapping import grpc_try_catch_wrapper
 
 
 class LoggingClient:
@@ -120,6 +119,7 @@ class LoggingClient:
         except FrogmlException as e:
             raise FrogmlException(f"Failed to fetch execution logs, error is [{e}]")
 
+    @grpc_try_catch_wrapper("Failed to read logs request")
     def read_logs(
         self,
         source,
@@ -127,22 +127,16 @@ class LoggingClient:
         after_offset,
         max_number_of_results,
         log_text_filter,
-    ):
-        try:
-            response = self._logging_service.ReadLogs(
-                ReadLogsRequest(
-                    source=source,
-                    before_offset=before_offset,
-                    after_offset=after_offset,
-                    search_filter=SearchFilter(
-                        log_text_filter=LogText(contains=log_text_filter)
-                    ),
-                    max_number_of_results=max_number_of_results,
-                )
-            )
-            return response
-        except RpcError as e:
-            raise FrogmlException(
-                f"Failed grpc read logs request, grpc error is "
-                f"[{e.details() if e.details() else e.code()}]"
+    ) -> ReadLogsResponse:
+        response: ReadLogsResponse = self._logging_service.ReadLogs(
+            ReadLogsRequest(
+                source=source,
+                before_offset=before_offset,
+                after_offset=after_offset,
+                search_filter=SearchFilter(
+                    log_text_filter=LogText(contains=log_text_filter)
+                ),
+                max_number_of_results=max_number_of_results,
             )
+        )
+        return response

core/inner/build_logic/interface/context_interface.py

@@ -10,6 +10,7 @@ from frogml.core.clients.instance_template.client import (
 )
 from frogml.core.clients.model_management import ModelsManagementClient
 from frogml.core.inner.build_logic.dependency_manager_type import DependencyManagerType
+from frogml.core.inner.di_configuration import UserAccountConfiguration
 
 
 @dataclass
@@ -56,3 +57,7 @@ class Context(metaclass=ABCMeta):
     # Upload Custom Wheels
     custom_runtime_wheel: Optional[Path] = field(default=None)
     custom_core_wheel: Optional[Path] = field(default=None)
+
+    platform_url: str = field(
+        default_factory=UserAccountConfiguration().retrieve_platform_url
+    )

core/inner/di_configuration/account.py

@@ -104,3 +104,11 @@ class UserAccountConfiguration:
             return getattr(auth, "token")
         except AttributeError as e:
             raise FrogmlLoginException("Token is not configured") from e
+
+    @staticmethod
+    def retrieve_platform_url() -> str:
+        """Returns the platform URL with the '/ui/ml' suffix based on the authentication client configuration."""
+        try:
+            return f"{FrogMLAuthClient().get_base_url()}/ui/ml"
+        except ValueError:
+            return ""

core/inner/tool/auth.py

@@ -23,6 +23,10 @@ class FrogMLAuthClient:
 
         return cast(str, self._token)
 
+    def get_base_url(self) -> str:
+        artifactory_url, _ = get_credentials(self.auth_config)
+        return self.__format_artifactory_url(artifactory_url)
+
     def get_tenant_id(self: Self) -> str:
         if not self._tenant_id:
             self.login()
@@ -46,12 +50,7 @@ class FrogMLAuthClient:
             "Failed to authenticate with JFrog. Please check your credentials"
         )
 
-        # Remove '/artifactory/' from the URL
-        if "/artifactory" in artifactory_url:
-            base_url = artifactory_url.replace("/artifactory", "/ui")
-        else:
-            # Remove trailing slash if it exists and append /ui
-            base_url = artifactory_url.rstrip("/") + "/ui"
+        base_url: str = self.__format_artifactory_url(artifactory_url)
 
         url = f"{base_url}/api/v1/system/auth/screen/footer"
 
@@ -73,3 +72,10 @@ class FrogMLAuthClient:
                 "Authentication with JFrog failed: Only JWT Access Tokens are supported. "
                 "Please ensure you are using a valid JWT Access Token."
             )
+
+    @staticmethod
+    def __format_artifactory_url(artifactory_url: str) -> str:
+        # Remove '/artifactory' from the URL
+        base_url: str = artifactory_url.replace("/artifactory", "")
+        # Remove trailing slash if exists
+        return base_url.rstrip("/")

{frogml_core-0.0.120.dist-info → frogml_core-0.0.121.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.120
+Version: 0.0.121
 Summary: frogml 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.120.dist-info → frogml_core-0.0.121.dist-info}/RECORD

@@ -674,7 +674,7 @@ core/clients/kube_deployment_captain/client.py,sha256=la4V7WsVL1z4zuLQtPZET1kjvG
 core/clients/location_discovery/__init__.py,sha256=sqGQ75YHFE6nvOcir38fykUUmAa6cFEIze8PJYgYWRc,44
 core/clients/location_discovery/client.py,sha256=ZcBbbLqzZ9E7oLyamBTLTpp611LldhfFOSkzWroyIQg,2895
 core/clients/logging_client/__init__.py,sha256=1OCHnigQBYThBwGbxCreYA0BgP0HcuLFzNEWd3Yxh-c,34
-core/clients/logging_client/client.py,sha256=qTI4X9be4iK6v6G17-xiITJD8EQwxmXLqC3Iiec-6cE,4954
+core/clients/logging_client/client.py,sha256=vq2Fv7UAEnrG910Npp1COxxWQ2_NWofbAStPkLhiz1w,4836
 core/clients/model_management/__init__.py,sha256=vjWVP8MjmK4_A70WOgJqa6x24AeLK-ABjGJtogGzw9w,43
 core/clients/model_management/client.py,sha256=bDBHrK4rssA67-cPPHCe4wA6jkphIjaxaMwxBYPfyIU,4918
 core/clients/model_version_manager/__init__.py,sha256=4Pnfzj4Egps48__dProdbSKQl5pNip0hGJd75w67BfY,46
@@ -765,7 +765,7 @@ core/inner/build_logic/execute_build_pipeline.py,sha256=n607h5ozBFcFexJ6E9FHwgrl
 core/inner/build_logic/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 core/inner/build_logic/interface/build_logger_interface.py,sha256=JUxldJuhMVHoXk9nZc9tz7-LPOMC99Z32oQYHSHpffY,528
 core/inner/build_logic/interface/build_phase.py,sha256=DNOcg11RVCSPpnGcAk2xDYEXwQ6UNWFoiGMpjgSFPt8,675
-core/inner/build_logic/interface/context_interface.py,sha256=R4HMaoTg3x8prLExrje8JGbFovCScjYcR81VJ1hukRs,2120
+core/inner/build_logic/interface/context_interface.py,sha256=97RU5gucN6CSSXud4rqKdlGhF73eroPup4OlIWAWgh4,2303
 core/inner/build_logic/interface/phase_run_handler.py,sha256=bTeKMgbG85SuL7MfDJpzsO8HlN_H6F8Q6Wnt8wJYXGM,1744
 core/inner/build_logic/interface/step_inteface.py,sha256=vRQRk5Z5n7JuA3GNgVJOIc62i8iG7WSvsG1f2nOOVDQ,746
 core/inner/build_logic/interface/time_source.py,sha256=njwil9A1sxP4SoB8LxtNhWhlV2-w1XOpoF4_wccNVYU,585
@@ -801,7 +801,7 @@ core/inner/build_logic/tools/text.py,sha256=tH-v19Mt8l90sMVxku5XRtrderT0qdRqJ-jL
 core/inner/build_logic/trigger_build_context.py,sha256=eWR35HQQKKNaPOfl64IB8xvCzl2vU6hgSR55qf9l7Lw,207
 core/inner/const.py,sha256=eP8Naruk3EnRWDdS9gwpozUYA9Nxznybw7Eiv4k5l38,126
 core/inner/di_configuration/__init__.py,sha256=7TE1MMfkFvBzHIzhAZ1L-vRgbScCIIMd-aXU9IFcs98,2130
-core/inner/di_configuration/account.py,sha256=InonyAqGXY-46olKsWYp362J8DeDu7koVmk61WBACZE,2822
+core/inner/di_configuration/account.py,sha256=oREHMbzSEgRSR6V9cQRjDYefygq9wu5_Q_nEC1ws4X4,3121
 core/inner/di_configuration/config.yml,sha256=GUvaZMWIDIR_d7hFcPVG_kHdCwpERKH1AFDakG3vqI4,242
 core/inner/di_configuration/containers.py,sha256=E8ebGj0d1_8iMOn_fbcfKXwbXgSbLBQCKgA9_JV38E4,1148
 core/inner/instance_template/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -810,7 +810,7 @@ core/inner/model_loggers_utils.py,sha256=mGBZQ1CbiEePaoftFEH_yfLlsxP8fcPcu83Cb8U
 core/inner/provider.py,sha256=3evQnyp0v0enpvGGDyaZziusO4BGi-U9j1sno8DAHo4,70
 core/inner/singleton_meta.py,sha256=1cU99I0f9tjuMQLMJyLsK1oK3fZJMsO5-TbRHAMXqds,627
 core/inner/tool/__init__.py,sha256=rmOSE-ejnzDG_H7kbikPQxEO4TFIkhBWjOXhTIrldiU,35
-core/inner/tool/auth.py,sha256=ZQdb-vgRNwBz1yshdPofcH5Qfc5YAkAJG55bbp95sVU,2652
+core/inner/tool/auth.py,sha256=Ya55AgSY_feZLtaIje91z1rSG5JsLC-Jh6NdomsOTcs,2858
 core/inner/tool/grpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 core/inner/tool/grpc/grpc_auth.py,sha256=8lGC1B3IgLuVzY1X6aEozGI3gnzLlA5WDZ7VWn4qNY0,1421
 core/inner/tool/grpc/grpc_tools.py,sha256=g49mtjSblXdSrFBSNPmsgCgDXHEzliqQ4uYDWRs527Q,7247
@@ -1011,6 +1011,6 @@ storage/utils/__init__.py,sha256=HQUWfuGUIPZY7kfS795TRW8BQ4WmNqrNjS7lUrbxCdk,299
 storage/utils/_input_checks_utility.py,sha256=TgQ7Ycdkdu8bdDPX-jOvzo2QazccsRqPv4Qm3c_U4HU,3221
 storage/utils/_storage_utils.py,sha256=HB2g7uY5A3b33yIcAUM1OjHb5jWsnpESsiDrEviQwrI,366
 storage/utils/_url_utils.py,sha256=NUEfz9Fp1iE8b676-A5wrMlSTsJVRKrUhcUItOFAJD8,821
-frogml_core-0.0.120.dist-info/METADATA,sha256=w0DPz4ocOtWiztDcldwSiFO6dLqTvdzO5LVPaV9jrp0,14893
-frogml_core-0.0.120.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-frogml_core-0.0.120.dist-info/RECORD,,
+frogml_core-0.0.121.dist-info/METADATA,sha256=S8rJjrsTtvUqacp-lOam7MnxtxQClofCVISy2785iHo,14893
+frogml_core-0.0.121.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+frogml_core-0.0.121.dist-info/RECORD,,