dasl-client 1.0.5__tar.gz → 1.0.7__tar.gz

{dasl_client-1.0.5 → dasl_client-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dasl_client
-Version: 1.0.5
+Version: 1.0.7
 Summary: The DASL client library used for interacting with the DASL workspace
 Home-page: https://github.com/antimatter/asl
 Author: Antimatter Team
@@ -8,7 +8,7 @@ Author-email: Antimatter Team <support@antimatter.io>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dasl_api==0.1.10
+Requires-Dist: dasl_api==0.1.12
 Requires-Dist: databricks-sdk>=0.41.0
 Requires-Dist: pydantic>=2
 

dasl_client-1.0.7/dasl_client/conn/client_identifier.py

@@ -0,0 +1,23 @@
+from importlib.metadata import version
+
+
+def get_user_agent() -> str:
+    """
+    A helper function defining the user agent for requests originating from
+    the ASL python conn library. We include the version of the API that the
+    connection was built off.
+
+    :return: A user-agent string.
+    """
+    return get_client_identifier()
+
+
+def get_client_identifier() -> str:
+    """
+    A helper function defining the client identifier for identifying the python
+    client. We include the version of the version of the API that the client
+    uses.
+
+    :return: The python client identifier.
+    """
+    return f"asl-python-client/{version('dasl_api')}"

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client/conn/conn.py

@@ -4,7 +4,7 @@ from typing import Optional
 import urllib3
 from dasl_api import ApiClient, Configuration
 
-from dasl_client.conn.user_agent import get_user_agent
+from dasl_client.conn.client_identifier import get_user_agent
 
 
 def get_base_conn(enable_retries: bool = True, host: Optional[str] = None) -> ApiClient:

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client/types/datasource.py

@@ -507,7 +507,6 @@ class SilverSpec(BaseModel):
                 Overrides for preset filters.
             add_fields (Optional[List[FieldSpec]]): User defined fields to
                 add to the transformation.
-            utils (Optional[FieldUtils]): Utilities for handling fields.
         """
 
         class Custom(BaseModel):
@@ -574,7 +573,6 @@ class SilverSpec(BaseModel):
         post_filter: Optional[str] = None
         preset_overrides: Optional["SilverSpec.PreTransform.PresetOverrides"] = None
         add_fields: Optional[List[FieldSpec]] = None
-        utils: Optional[FieldUtils] = None
 
         @staticmethod
         def from_api_obj(
@@ -595,7 +593,6 @@ class SilverSpec(BaseModel):
                     obj.preset_overrides
                 ),
                 add_fields=add_fields,
-                utils=FieldUtils.from_api_obj(obj.utils),
             )
 
         def to_api_obj(self) -> CoreV1DataSourceSpecSilverPreTransform:
@@ -611,7 +608,6 @@ class SilverSpec(BaseModel):
                 post_filter=self.post_filter,
                 preset_overrides=Helpers.maybe(to_api_obj, self.preset_overrides),
                 add_fields=add_fields,
-                utils=Helpers.maybe(to_api_obj, self.utils),
             )
 
     class Transform(BaseModel):
@@ -936,7 +932,6 @@ class GoldSpec(BaseModel):
             filter (Optional[str]): A SQL filter to apply before processing.
             post_filter (Optional[str]): A SQL filter to apply after
                 processing.
-            utils (Optional[FieldUtils]): Utilities for field handling.
         """
 
         class Custom(BaseModel):
@@ -979,7 +974,6 @@ class GoldSpec(BaseModel):
         add_fields: Optional[List[FieldSpec]] = None
         filter: Optional[str] = None
         post_filter: Optional[str] = None
-        utils: Optional[FieldUtils] = None
 
         @staticmethod
         def from_api_obj(
@@ -998,7 +992,6 @@ class GoldSpec(BaseModel):
                 add_fields=add_fields,
                 filter=obj.filter,
                 post_filter=obj.post_filter,
-                utils=FieldUtils.from_api_obj(obj.utils),
             )
 
         def to_api_obj(
@@ -1016,7 +1009,6 @@ class GoldSpec(BaseModel):
                 add_fields=add_fields,
                 filter=self.filter,
                 post_filter=self.post_filter,
-                utils=Helpers.maybe(to_api_obj, self.utils),
             )
 
     class AddTables(BaseModel):
@@ -1032,11 +1024,8 @@ class GoldSpec(BaseModel):
             filter (Optional[str]): A SQL filter to apply.
             post_filter (Optional[str]): A SQL filter to apply after
                 processing.
-            override_liquid_columns (Optional[List[str]]): Columns to override
-                in the preset.
             fields (Optional[List[FieldSpec]]): Field specifications for the
                 new table.
-            utils (Optional[FieldUtils]): Utilities for field handling.
         """
 
         class Custom(BaseModel):
@@ -1077,9 +1066,7 @@ class GoldSpec(BaseModel):
         custom: Optional["GoldSpec.AddTables.Custom"] = None
         filter: Optional[str] = None
         post_filter: Optional[str] = None
-        override_liquid_columns: Optional[List[str]] = None
         fields: Optional[List[FieldSpec]] = None
-        utils: Optional[FieldUtils] = None
 
         @staticmethod
         def from_api_obj(
@@ -1096,9 +1083,7 @@ class GoldSpec(BaseModel):
                 source_table=obj.source_table,
                 filter=obj.filter,
                 post_filter=obj.post_filter,
-                override_liquid_columns=obj.override_liquid_columns,
                 fields=fields,
-                utils=FieldUtils.from_api_obj(obj.utils),
             )
 
         def to_api_obj(self) -> CoreV1DataSourceSpecGoldPresetOverridesAddTablesInner:
@@ -1112,9 +1097,7 @@ class GoldSpec(BaseModel):
                 source_table=self.source_table,
                 filter=self.filter,
                 post_filter=self.post_filter,
-                override_liquid_columns=self.override_liquid_columns,
                 fields=fields,
-                utils=Helpers.maybe(to_api_obj, self.utils),
             )
 
     omit_tables: Optional[List[str]] = None

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client/types/rule.py

@@ -289,6 +289,9 @@ class Rule(BaseModel):
                     join_expr (Optional[str]): For tables other than the
                         first, the join condition expression to join with
                         the preceding table.
+                    streaming (Optional[bool]): For tables other than the
+                        first, is this a streaming join or static. Default
+                        is false, except on the first table.
                 """
 
                 class Watermark(BaseModel):
@@ -335,6 +338,7 @@ class Rule(BaseModel):
                 alias: Optional[str] = None
                 join_type: Optional[str] = None
                 join_expr: Optional[str] = None
+                streaming: Optional[bool] = None
 
                 @staticmethod
                 def from_api_obj(
@@ -350,6 +354,7 @@ class Rule(BaseModel):
                         alias=obj.alias,
                         join_type=obj.join_type,
                         join_expr=obj.join_expr,
+                        streaming=obj.streaming,
                     )
 
                 def to_api_obj(self) -> CoreV1RuleSpecInputStreamTablesInner:
@@ -361,6 +366,7 @@ class Rule(BaseModel):
                         alias=self.alias,
                         join_type=self.join_type,
                         join_expr=self.join_expr,
+                        streaming=self.streaming,
                     )
 
             tables: Optional[List["Rule.Input.Stream.Table"]] = None

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client/types/types.py

@@ -9,6 +9,8 @@ from dasl_api import (
     CoreV1Schedule,
 )
 
+from dasl_client.conn.client_identifier import get_client_identifier
+
 
 class Metadata(BaseModel):
     """
@@ -39,6 +41,8 @@ class Metadata(BaseModel):
             be updated by the user.
         ui_status (Optional[str]): Internal resource status. Cannot be
             updated by the user.
+        client_of_origin (Optional[str]): The client that last created or
+            modified this resource.
     """
 
     name: Optional[str] = None
@@ -54,6 +58,7 @@ class Metadata(BaseModel):
     deleted: Optional[bool] = None
     resource_status: Optional[str] = None
     ui_status: Optional[str] = None
+    client_of_origin: Optional[str] = None
 
     @staticmethod
     def from_api_obj(obj: Optional[CommonV1ObjectMeta]) -> "Metadata":
@@ -73,6 +78,7 @@ class Metadata(BaseModel):
             deleted=obj.deleted,
             resource_status=obj.resource_status,
             ui_status=obj.ui_status,
+            client_of_origin=obj.client_of_origin,
         )
 
     def to_api_obj(self) -> CommonV1ObjectMeta:
@@ -90,6 +96,7 @@ class Metadata(BaseModel):
             deleted=self.deleted,
             resource_status=self.resource_status,
             ui_status=self.ui_status,
+            client_of_origin=self.client_of_origin or get_client_identifier(),
         )
 
 

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client/types/workspace_config.py

@@ -8,7 +8,6 @@ from dasl_api import (
     WorkspaceV1ExportConfigWebhookConfigDestination,
     WorkspaceV1WorkspaceConfig,
     WorkspaceV1WorkspaceConfigSpec,
-    WorkspaceV1WorkspaceConfigSpecComputeGroupLimitsInner,
     WorkspaceV1WorkspaceConfigSpecDefaultConfig,
     WorkspaceV1WorkspaceConfigSpecDetectionRuleMetadata,
     WorkspaceV1WorkspaceConfigSpecManagedRetentionInner,
@@ -238,35 +237,6 @@ class WorkspaceConfigObservables(BaseModel):
         )
 
 
-class ComputeGroupLimits(BaseModel):
-    """
-    Configuration of limits for the number of resources that can be placed
-    in a user-defined compute group.
-
-    Attributes:
-        group_name (Optional[str]): Name of the compute group for this limit.
-        limit (Optional[int]): Limit of maximum number of resources in the group.
-    """
-
-    group_name: Optional[str] = None
-    limit: Optional[int] = None
-
-    @staticmethod
-    def from_api_obj(
-        obj: WorkspaceV1WorkspaceConfigSpecComputeGroupLimitsInner,
-    ) -> "ComputeGroupLimits":
-        return ComputeGroupLimits(
-            group_name=obj.group_name,
-            limit=obj.limit,
-        )
-
-    def to_api_obj(self) -> WorkspaceV1WorkspaceConfigSpecComputeGroupLimitsInner:
-        return WorkspaceV1WorkspaceConfigSpecComputeGroupLimitsInner(
-            group_name=self.group_name,
-            limit=self.limit,
-        )
-
-
 class DefaultConfig(BaseModel):
     """
     Configuration of the schemas, notebook storage locations, checkpoint
@@ -592,10 +562,6 @@ class WorkspaceConfig(BaseModel):
             to the export of operational alerts to various destinations.
         observables (Optional[WorkspaceConfigObservables]): Declaration of
             the types of observables generated by the system.
-        compute_group_limits (Optional[List[ComputeGroupLimits]]): Limits
-            on the number of resources placed in a manually specified
-            compute group - corresponds to the number of resources that
-            are grouped into a single Job.
         dasl_storage_path (Optional[str]): The path to a directory where
             DASL can store internal files and state.
         default_config (Optional[DefaultConfig]): Configuration settings
@@ -615,7 +581,6 @@ class WorkspaceConfig(BaseModel):
     notable_export: Optional[ExportConfig] = None
     operational_alert_export: Optional[ExportConfig] = None
     observables: Optional[WorkspaceConfigObservables] = None
-    compute_group_limits: Optional[List[ComputeGroupLimits]] = None
     dasl_storage_path: Optional[str] = None
     default_config: Optional[DefaultConfig] = None
     managed_retention: Optional[List[ManagedRetention]] = None
@@ -625,13 +590,6 @@ class WorkspaceConfig(BaseModel):
     def from_api_obj(obj: WorkspaceV1WorkspaceConfig) -> "WorkspaceConfig":
         spec = obj.spec
 
-        compute_group_limits = None
-        if spec.compute_group_limits is not None:
-            compute_group_limits = [
-                ComputeGroupLimits.from_api_obj(item)
-                for item in spec.compute_group_limits
-            ]
-
         managed_retention = None
         if spec.managed_retention is not None:
             managed_retention = [
@@ -652,7 +610,6 @@ class WorkspaceConfig(BaseModel):
                 spec.operational_alert_export
             ),
             observables=WorkspaceConfigObservables.from_api_obj(spec.observables),
-            compute_group_limits=compute_group_limits,
             dasl_storage_path=spec.dasl_storage_path,
             default_config=DefaultConfig.from_api_obj(spec.default_config),
             managed_retention=managed_retention,
@@ -660,11 +617,6 @@ class WorkspaceConfig(BaseModel):
         )
 
     def to_api_obj(self) -> WorkspaceV1WorkspaceConfig:
-        compute_group_limits = None
-        if self.compute_group_limits is not None:
-            compute_group_limits = [
-                item.to_api_obj() for item in self.compute_group_limits
-            ]
 
         managed_retention = None
         if self.managed_retention is not None:
@@ -687,7 +639,6 @@ class WorkspaceConfig(BaseModel):
                     to_api_obj, self.operational_alert_export
                 ),
                 observables=Helpers.maybe(to_api_obj, self.observables),
-                compute_group_limits=compute_group_limits,
                 dasl_storage_path=self.dasl_storage_path,
                 default_config=Helpers.maybe(to_api_obj, self.default_config),
                 managed_retention=managed_retention,

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dasl_client
-Version: 1.0.5
+Version: 1.0.7
 Summary: The DASL client library used for interacting with the DASL workspace
 Home-page: https://github.com/antimatter/asl
 Author: Antimatter Team
@@ -8,7 +8,7 @@ Author-email: Antimatter Team <support@antimatter.io>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dasl_api==0.1.10
+Requires-Dist: dasl_api==0.1.12
 Requires-Dist: databricks-sdk>=0.41.0
 Requires-Dist: pydantic>=2
 

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client.egg-info/SOURCES.txt

@@ -13,8 +13,8 @@ dasl_client.egg-info/top_level.txt
 dasl_client/auth/__init__.py
 dasl_client/auth/auth.py
 dasl_client/conn/__init__.py
+dasl_client/conn/client_identifier.py
 dasl_client/conn/conn.py
-dasl_client/conn/user_agent.py
 dasl_client/errors/__init__.py
 dasl_client/errors/errors.py
 dasl_client/types/__init__.py

{dasl_client-1.0.5 → dasl_client-1.0.7}/dasl_client.egg-info/requires.txt

@@ -1,3 +1,3 @@
-dasl_api==0.1.10
+dasl_api==0.1.12
 databricks-sdk>=0.41.0
 pydantic>=2

{dasl_client-1.0.5 → dasl_client-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dasl_client"
-version = "1.0.5"
+version = "1.0.7"
 description = "The DASL client library used for interacting with the DASL workspace"
 readme = "README.md"
 authors = [
@@ -13,7 +13,7 @@ authors = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "dasl_api==0.1.10",
+    "dasl_api==0.1.12",
     "databricks-sdk>=0.41.0",
     "pydantic>=2"
 ]

{dasl_client-1.0.5 → dasl_client-1.0.7}/test/test_api_changes.py

@@ -1,6 +1,5 @@
 import inspect
 import json
-import os
 
 import pytest
 

{dasl_client-1.0.5 → dasl_client-1.0.7}/test/test_api_surface.py

@@ -62,6 +62,7 @@ def test_workspace_config(api_client):
         metadata=Metadata(
             name="config",
             workspace=workspace,
+            client_of_origin=get_client_identifier(),
         ),
         dasl_storage_path="/Volumes/automated_test_cases/default/test",
         system_tables_config=SystemTablesConfig(

{dasl_client-1.0.5 → dasl_client-1.0.7}/test/test_marshaling.py

@@ -22,6 +22,7 @@ def test_workspace_config_marshal_unmarshal():
             deleted=False,
             resource_status="none",
             ui_status="ok",
+            client_of_origin=get_client_identifier(),
         ),
         system_tables_config=SystemTablesConfig(
             catalog_name="catalog_random", var_schema="schema_random"
@@ -73,10 +74,6 @@ def test_workspace_config_marshal_unmarshal():
             ],
             relationships=["rel1", "rel2"],
         ),
-        compute_group_limits=[
-            ComputeGroupLimits(group_name="group1", limit=1),
-            ComputeGroupLimits(group_name="group2", limit=2),
-        ],
         dasl_storage_path="/random/storage/path",
         default_config=DefaultConfig(
             datasources=DefaultConfig.Config(
@@ -221,6 +218,7 @@ def test_data_source_marshal_unmarshal():
             deleted=False,
             resource_status="deletionPending",
             ui_status="ok",
+            client_of_origin=get_client_identifier(),
         ),
         source="s3://data-bucket/source",
         source_type="custom",
@@ -315,28 +313,6 @@ def test_data_source_marshal_unmarshal():
                         ),
                     ),
                 ],
-                utils=FieldUtils(
-                    unreferenced_columns=FieldUtils.UnreferencedColumns(
-                        preserve=True,
-                        embed_column="embed_col1",
-                        omit_columns=["omit1", "omit2"],
-                        duplicate_prefix="dup_",
-                    ),
-                    json_extract=[
-                        FieldUtils.JsonExtract(
-                            source="json_source1",
-                            omit_fields=["json_omit1", "json_omit2"],
-                            duplicate_prefix="json_dup_",
-                            embed_column="json_embed1",
-                        ),
-                        FieldUtils.JsonExtract(
-                            source="json_source2",
-                            omit_fields=["json_omit3", "json_omit4"],
-                            duplicate_prefix="json_dup2_",
-                            embed_column="json_embed2",
-                        ),
-                    ],
-                ),
             ),
             transform=SilverSpec.Transform(
                 skip_silver_transform=False,
@@ -494,22 +470,6 @@ def test_data_source_marshal_unmarshal():
                     ],
                     filter="gold_filter_condition",
                     post_filter="gold_post_filter_condition",
-                    utils=FieldUtils(
-                        unreferenced_columns=FieldUtils.UnreferencedColumns(
-                            preserve=False,
-                            embed_column="gold_embed",
-                            omit_columns=["gold_omit_col1", "gold_omit_col2"],
-                            duplicate_prefix="gold_dup_",
-                        ),
-                        json_extract=[
-                            FieldUtils.JsonExtract(
-                                source="gold_json_source",
-                                omit_fields=["gold_json_omit1", "gold_json_omit2"],
-                                duplicate_prefix="gold_json_dup_",
-                                embed_column="gold_json_embed",
-                            )
-                        ],
-                    ),
                 )
             ],
             add_tables=[
@@ -522,7 +482,6 @@ def test_data_source_marshal_unmarshal():
                     ),
                     filter="gold_add_filter_condition",
                     post_filter="gold_add_post_filter_condition",
-                    override_liquid_columns=["gold_liquid1", "gold_liquid2"],
                     fields=[
                         FieldSpec(
                             name="gold_add_field1",
@@ -547,25 +506,6 @@ def test_data_source_marshal_unmarshal():
                             ),
                         )
                     ],
-                    utils=FieldUtils(
-                        unreferenced_columns=FieldUtils.UnreferencedColumns(
-                            preserve=True,
-                            embed_column="gold_add_embed",
-                            omit_columns=["gold_add_omit1", "gold_add_omit2"],
-                            duplicate_prefix="gold_add_dup_",
-                        ),
-                        json_extract=[
-                            FieldUtils.JsonExtract(
-                                source="gold_add_json_source",
-                                omit_fields=[
-                                    "gold_add_json_omit1",
-                                    "gold_add_json_omit2",
-                                ],
-                                duplicate_prefix="gold_add_json_dup_",
-                                embed_column="gold_add_json_embed",
-                            )
-                        ],
-                    ),
                 ),
             ],
         ),
@@ -610,6 +550,7 @@ def test_rule_marshal_unmarshal():
             deleted=False,
             resource_status="none",
             ui_status="ok",
+            client_of_origin=get_client_identifier(),
         ),
         rule_metadata=Rule.RuleMetadata(
             version=1.0,

dasl_client-1.0.5/dasl_client/conn/user_agent.py

@@ -1,11 +0,0 @@
-from importlib.metadata import version
-
-
-def get_user_agent() -> str:
-    """
-    A helper function defining the user agent for requests originating from
-    the ASL python conn library. We include the version of the API that the
-    connection was built off.
-    :return: A user-agent string.
-    """
-    return f"asl-python-conn/{version('dasl_api')}"