frogml-core 0.0.43__tar.gz → 0.0.44__tar.gz

{frogml_core-0.0.43 → frogml_core-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: frogml-core
-Version: 0.0.43
+Version: 0.0.44
 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.43 → frogml_core-0.0.44}/frogml_core/__init__.py

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

{frogml_core-0.0.43 → frogml_core-0.0.44}/frogml_proto/qwak/administration/account/v1/account_pb2.py

@@ -19,7 +19,7 @@ from frogml_proto.qwak.administration.account.v1 import terms_pb2 as qwak_dot_ad
 from frogml_proto.qwak.administration.account.v1 import jfrog_tenant_details_pb2 as qwak_dot_administration_dot_account_dot_v1_dot_jfrog__tenant__details__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,qwak/administration/account/v1/account.proto\x12\x1eqwak.administration.account.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x30qwak/administration/account/v1/preferences.proto\x1a*qwak/administration/account/v1/terms.proto\x1a\x39qwak/administration/account/v1/jfrog_tenant_details.proto\"\xc9\x04\n\x07\x41\x63\x63ount\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x45\n\x06status\x18\x04 \x01(\x0e\x32\x35.qwak.administration.account.v1.AccountActivityStatus\x12\x44\n\x0bpreferences\x18\x07 \x01(\x0b\x32/.qwak.administration.account.AccountPreferences\x12\x1e\n\x16\x64\x65\x66\x61ult_environment_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x34\n\x10last_modified_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x39\n\x04type\x18\t \x01(\x0e\x32+.qwak.administration.account.v1.AccountType\x12\x39\n\x04tier\x18\n \x01(\x0e\x32+.qwak.administration.account.v1.AccountTier\x12I\n\x0e\x61\x63\x63\x65pted_terms\x18\x0b \x01(\x0b\x32\x31.qwak.administration.account.AccountAcceptedTerms\x12P\n\x14jfrog_tenant_details\x18\x0c \x01(\x0b\x32\x32.qwak.administration.account.v1.JfrogTenantDetails\"c\n\x11ListAccountFilter\x12N\n\x0f\x61\x63tivity_status\x18\x01 \x01(\x0e\x32\x35.qwak.administration.account.v1.AccountActivityStatus\"_\n\x12\x41utoBindingAccount\x12\n\n\x02id\x18\x01 \x01(\t\x12=\n\x04rule\x18\x02 \x01(\x0b\x32/.qwak.administration.account.v1.AutoBindingRule\")\n\x0f\x41utoBindingRule\x12\x16\n\x0e\x65mail_hostname\x18\x01 \x01(\t\"\xbe\x01\n\x0c\x41\x63\x63ountBrief\x12\x12\n\naccount_id\x18\x01 \x01(\t\x12\x17\n\x0fjfrog_tenant_id\x18\x02 \x01(\t\x12\x1b\n\x0f\x65nvironment_ids\x18\x03 \x03(\tB\x02\x18\x01\x12\x16\n\x0e\x64\x65\x66\x61ult_env_id\x18\x04 \x01(\t\x12L\n\x12\x65nvironment_briefs\x18\x05 \x03(\x0b\x32\x30.qwak.administration.account.v1.EnvironmentBrief\"B\n\x10\x45nvironmentBrief\x12\x16\n\x0e\x65nvironment_id\x18\x01 \x01(\t\x12\x16\n\x0estorage_bucket\x18\x02 \x01(\t*k\n\x15\x41\x63\x63ountActivityStatus\x12\x1a\n\x16\x41\x43\x43OUNT_STATUS_INVALID\x10\x00\x12\x19\n\x15\x41\x43\x43OUNT_STATUS_ACTIVE\x10\x01\x12\x1b\n\x17\x41\x43\x43OUNT_STATUS_DISABLED\x10\x02*=\n\x0b\x41\x63\x63ountType\x12\x18\n\x14\x41\x43\x43OUNT_TYPE_INVALID\x10\x00\x12\n\n\x06HYBRID\x10\x01\x12\x08\n\x04SAAS\x10\x02*L\n\x0b\x41\x63\x63ountTier\x12\x18\n\x14\x41\x43\x43OUNT_TIER_INVALID\x10\x00\x12\x08\n\x04\x46REE\x10\x01\x12\r\n\tVALIDATED\x10\x02\x12\n\n\x06PAYING\x10\x03\x42\xb4\x01\n)com.qwak.ai.administration.api.account.v1P\x01Z\x84\x01github.com/qwak-ai/qwak-platform/services/core/java/user-management/user-management-api/pb/qwak/administration/account/v1;account_v0b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,qwak/administration/account/v1/account.proto\x12\x1eqwak.administration.account.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x30qwak/administration/account/v1/preferences.proto\x1a*qwak/administration/account/v1/terms.proto\x1a\x39qwak/administration/account/v1/jfrog_tenant_details.proto\"\xc9\x04\n\x07\x41\x63\x63ount\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x45\n\x06status\x18\x04 \x01(\x0e\x32\x35.qwak.administration.account.v1.AccountActivityStatus\x12\x44\n\x0bpreferences\x18\x07 \x01(\x0b\x32/.qwak.administration.account.AccountPreferences\x12\x1e\n\x16\x64\x65\x66\x61ult_environment_id\x18\x08 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x34\n\x10last_modified_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x39\n\x04type\x18\t \x01(\x0e\x32+.qwak.administration.account.v1.AccountType\x12\x39\n\x04tier\x18\n \x01(\x0e\x32+.qwak.administration.account.v1.AccountTier\x12I\n\x0e\x61\x63\x63\x65pted_terms\x18\x0b \x01(\x0b\x32\x31.qwak.administration.account.AccountAcceptedTerms\x12P\n\x14jfrog_tenant_details\x18\x0c \x01(\x0b\x32\x32.qwak.administration.account.v1.JfrogTenantDetails\"c\n\x11ListAccountFilter\x12N\n\x0f\x61\x63tivity_status\x18\x01 \x01(\x0e\x32\x35.qwak.administration.account.v1.AccountActivityStatus\"_\n\x12\x41utoBindingAccount\x12\n\n\x02id\x18\x01 \x01(\t\x12=\n\x04rule\x18\x02 \x01(\x0b\x32/.qwak.administration.account.v1.AutoBindingRule\")\n\x0f\x41utoBindingRule\x12\x16\n\x0e\x65mail_hostname\x18\x01 \x01(\t\"\xbb\x02\n\x0c\x41\x63\x63ountBrief\x12\x12\n\naccount_id\x18\x01 \x01(\t\x12\x19\n\x0fjfrog_tenant_id\x18\x02 \x01(\tH\x00\x12\x1b\n\x0f\x65nvironment_ids\x18\x03 \x03(\tB\x02\x18\x01\x12\x16\n\x0e\x64\x65\x66\x61ult_env_id\x18\x04 \x01(\t\x12L\n\x12\x65nvironment_briefs\x18\x05 \x03(\x0b\x32\x30.qwak.administration.account.v1.EnvironmentBrief\x12K\n\x15jfrog_project_details\x18\x06 \x01(\x0b\x32*.qwak.administration.account.v1.JPDDetailsH\x01\x42\x14\n\x12optional_tenant_idB\x16\n\x14optional_jpd_details\"B\n\x10\x45nvironmentBrief\x12\x16\n\x0e\x65nvironment_id\x18\x01 \x01(\t\x12\x16\n\x0estorage_bucket\x18\x02 \x01(\t*k\n\x15\x41\x63\x63ountActivityStatus\x12\x1a\n\x16\x41\x43\x43OUNT_STATUS_INVALID\x10\x00\x12\x19\n\x15\x41\x43\x43OUNT_STATUS_ACTIVE\x10\x01\x12\x1b\n\x17\x41\x43\x43OUNT_STATUS_DISABLED\x10\x02*=\n\x0b\x41\x63\x63ountType\x12\x18\n\x14\x41\x43\x43OUNT_TYPE_INVALID\x10\x00\x12\n\n\x06HYBRID\x10\x01\x12\x08\n\x04SAAS\x10\x02*L\n\x0b\x41\x63\x63ountTier\x12\x18\n\x14\x41\x43\x43OUNT_TIER_INVALID\x10\x00\x12\x08\n\x04\x46REE\x10\x01\x12\r\n\tVALIDATED\x10\x02\x12\n\n\x06PAYING\x10\x03\x42\xb4\x01\n)com.qwak.ai.administration.api.account.v1P\x01Z\x84\x01github.com/qwak-ai/qwak-platform/services/core/java/user-management/user-management-api/pb/qwak/administration/account/v1;account_v0b\x06proto3')
 
 _ACCOUNTACTIVITYSTATUS = DESCRIPTOR.enum_types_by_name['AccountActivityStatus']
 AccountActivityStatus = enum_type_wrapper.EnumTypeWrapper(_ACCOUNTACTIVITYSTATUS)
@@ -93,12 +93,12 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._serialized_options = b'\n)com.qwak.ai.administration.api.account.v1P\001Z\204\001github.com/qwak-ai/qwak-platform/services/core/java/user-management/user-management-api/pb/qwak/administration/account/v1;account_v0'
   _ACCOUNTBRIEF.fields_by_name['environment_ids']._options = None
   _ACCOUNTBRIEF.fields_by_name['environment_ids']._serialized_options = b'\030\001'
-  _ACCOUNTACTIVITYSTATUS._serialized_start=1356
-  _ACCOUNTACTIVITYSTATUS._serialized_end=1463
-  _ACCOUNTTYPE._serialized_start=1465
-  _ACCOUNTTYPE._serialized_end=1526
-  _ACCOUNTTIER._serialized_start=1528
-  _ACCOUNTTIER._serialized_end=1604
+  _ACCOUNTACTIVITYSTATUS._serialized_start=1481
+  _ACCOUNTACTIVITYSTATUS._serialized_end=1588
+  _ACCOUNTTYPE._serialized_start=1590
+  _ACCOUNTTYPE._serialized_end=1651
+  _ACCOUNTTIER._serialized_start=1653
+  _ACCOUNTTIER._serialized_end=1729
   _ACCOUNT._serialized_start=267
   _ACCOUNT._serialized_end=852
   _LISTACCOUNTFILTER._serialized_start=854
@@ -108,7 +108,7 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _AUTOBINDINGRULE._serialized_start=1052
   _AUTOBINDINGRULE._serialized_end=1093
   _ACCOUNTBRIEF._serialized_start=1096
-  _ACCOUNTBRIEF._serialized_end=1286
-  _ENVIRONMENTBRIEF._serialized_start=1288
-  _ENVIRONMENTBRIEF._serialized_end=1354
+  _ACCOUNTBRIEF._serialized_end=1411
+  _ENVIRONMENTBRIEF._serialized_start=1413
+  _ENVIRONMENTBRIEF._serialized_end=1479
 # @@protoc_insertion_point(module_scope)

{frogml_core-0.0.43 → frogml_core-0.0.44}/frogml_proto/qwak/administration/account/v1/account_pb2.pyi

@@ -219,6 +219,7 @@ class AccountBrief(google.protobuf.message.Message):
     ENVIRONMENT_IDS_FIELD_NUMBER: builtins.int
     DEFAULT_ENV_ID_FIELD_NUMBER: builtins.int
     ENVIRONMENT_BRIEFS_FIELD_NUMBER: builtins.int
+    JFROG_PROJECT_DETAILS_FIELD_NUMBER: builtins.int
     account_id: builtins.str
     jfrog_tenant_id: builtins.str
     @property
@@ -226,6 +227,8 @@ class AccountBrief(google.protobuf.message.Message):
     default_env_id: builtins.str
     @property
     def environment_briefs(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___EnvironmentBrief]: ...
+    @property
+    def jfrog_project_details(self) -> frogml_proto.qwak.administration.account.v1.jfrog_tenant_details_pb2.JPDDetails: ...
     def __init__(
         self,
         *,
@@ -234,8 +237,14 @@ class AccountBrief(google.protobuf.message.Message):
         environment_ids: collections.abc.Iterable[builtins.str] | None = ...,
         default_env_id: builtins.str = ...,
         environment_briefs: collections.abc.Iterable[global___EnvironmentBrief] | None = ...,
+        jfrog_project_details: frogml_proto.qwak.administration.account.v1.jfrog_tenant_details_pb2.JPDDetails | None = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["account_id", b"account_id", "default_env_id", b"default_env_id", "environment_briefs", b"environment_briefs", "environment_ids", b"environment_ids", "jfrog_tenant_id", b"jfrog_tenant_id"]) -> None: ...
+    def HasField(self, field_name: typing_extensions.Literal["jfrog_project_details", b"jfrog_project_details", "jfrog_tenant_id", b"jfrog_tenant_id", "optional_jpd_details", b"optional_jpd_details", "optional_tenant_id", b"optional_tenant_id"]) -> builtins.bool: ...
+    def ClearField(self, field_name: typing_extensions.Literal["account_id", b"account_id", "default_env_id", b"default_env_id", "environment_briefs", b"environment_briefs", "environment_ids", b"environment_ids", "jfrog_project_details", b"jfrog_project_details", "jfrog_tenant_id", b"jfrog_tenant_id", "optional_jpd_details", b"optional_jpd_details", "optional_tenant_id", b"optional_tenant_id"]) -> None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["optional_jpd_details", b"optional_jpd_details"]) -> typing_extensions.Literal["jfrog_project_details"] | None: ...
+    @typing.overload
+    def WhichOneof(self, oneof_group: typing_extensions.Literal["optional_tenant_id", b"optional_tenant_id"]) -> typing_extensions.Literal["jfrog_tenant_id"] | None: ...
 
 global___AccountBrief = AccountBrief
 

{frogml_core-0.0.43 → frogml_core-0.0.44}/frogml_proto/qwak/administration/account/v1/account_service_pb2.pyi

@@ -315,6 +315,7 @@ class GetAccountBriefRequest(google.protobuf.message.Message):
     JFROG_TENANT_ID_FIELD_NUMBER: builtins.int
     account_id: builtins.str
     jfrog_tenant_id: builtins.str
+    """The JFrog tenant id could be jpd_id for self-hosted"""
     def __init__(
         self,
         *,

{frogml_core-0.0.43 → frogml_core-0.0.44}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "frogml-core"
-version = "0.0.43"
+version = "0.0.44"
 description = "frogml Core contains the necessary objects and communication tools for using the Jfrog ml Platform"
 authors = ["Jfrog"]
 readme = "README.md"