dasl-client 1.0.11__py3-none-any.whl → 1.0.13__py3-none-any.whl

dasl_client/client.py

@@ -648,5 +648,7 @@ class Client:
         """
         with error_handler():
             return DataSourcePreset.from_api_obj(
-                self._content_client().content_v1_get_preset_datasource(self._workspace(), name)
+                self._content_client().content_v1_get_preset_datasource(
+                    self._workspace(), name
+                )
             )

dasl_client/types/content.py

@@ -2,9 +2,14 @@ from typing import Optional, List, Dict
 from pydantic import BaseModel
 
 from dasl_api import (
-    ContentV1PresetDataSourceList, ContentV1PresetDataSourceListItemsInner, ContentV1DatasourcePresetAutoloader,
-    ContentV1DatasourcePresetSilver, ContentV1DatasourcePresetSilverPreTransformInner,
-    ContentV1DatasourcePresetSilverTransformInner, ContentV1DatasourcePresetGoldInner, ContentV1DatasourcePreset,
+    ContentV1PresetDataSourceList,
+    ContentV1PresetDataSourceListItemsInner,
+    ContentV1DatasourcePresetAutoloader,
+    ContentV1DatasourcePresetSilver,
+    ContentV1DatasourcePresetSilverPreTransformInner,
+    ContentV1DatasourcePresetSilverTransformInner,
+    ContentV1DatasourcePresetGoldInner,
+    ContentV1DatasourcePreset,
     ContentV1DatasourcePresetAutoloaderCloudFiles,
 )
 
@@ -22,7 +27,7 @@ class SilverPreset(BaseModel):
 
         @staticmethod
         def from_api_obj(
-                obj: Optional[ContentV1DatasourcePresetSilverPreTransformInner],
+            obj: Optional[ContentV1DatasourcePresetSilverPreTransformInner],
         ) -> Optional["SilverPreset.PreTransform"]:
             if obj is None:
                 return None
@@ -48,7 +53,7 @@ class SilverPreset(BaseModel):
 
         @staticmethod
         def from_api_obj(
-                obj: Optional[ContentV1DatasourcePresetSilverTransformInner],
+            obj: Optional[ContentV1DatasourcePresetSilverTransformInner],
         ) -> Optional["SilverPreset.Transform"]:
             if obj is None:
                 return None
@@ -70,22 +75,26 @@ class SilverPreset(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1DatasourcePresetSilver],
+        obj: Optional[ContentV1DatasourcePresetSilver],
     ) -> Optional["SilverPreset"]:
         if obj is None:
             return None
 
         if obj.pre_transform is not None:
-            pre_transform = [SilverPreset.PreTransform.from_api_obj(item) for item in obj.pre_transform]
+            pre_transform = [
+                SilverPreset.PreTransform.from_api_obj(item)
+                for item in obj.pre_transform
+            ]
         else:
             pre_transform = None
 
         if obj.transform is not None:
-            transform = [SilverPreset.Transform.from_api_obj(item) for item in obj.transform]
+            transform = [
+                SilverPreset.Transform.from_api_obj(item) for item in obj.transform
+            ]
         else:
             transform = None
 
-
         return SilverPreset(
             pre_transform=pre_transform,
             transform=transform,
@@ -102,7 +111,7 @@ class GoldPreset(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1DatasourcePresetGoldInner],
+        obj: Optional[ContentV1DatasourcePresetGoldInner],
     ) -> Optional["GoldPreset"]:
         if obj is None:
             return None
@@ -127,7 +136,7 @@ class PresetCloudFiles(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1DatasourcePresetAutoloaderCloudFiles],
+        obj: Optional[ContentV1DatasourcePresetAutoloaderCloudFiles],
     ) -> Optional["PresetCloudFiles"]:
         if obj is None:
             return None
@@ -146,7 +155,7 @@ class PresetAutoloader(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1DatasourcePresetAutoloader],
+        obj: Optional[ContentV1DatasourcePresetAutoloader],
     ) -> Optional["PresetAutoloader"]:
         if obj is None:
             return None
@@ -158,6 +167,7 @@ class PresetAutoloader(BaseModel):
             cloud_files=PresetCloudFiles.from_api_obj(obj.cloud_files),
         )
 
+
 class DataSourcePreset(BaseModel):
 
     name: Optional[str] = None
@@ -169,7 +179,7 @@ class DataSourcePreset(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1DatasourcePreset],
+        obj: Optional[ContentV1DatasourcePreset],
     ) -> Optional["DataSourcePreset"]:
         if obj is None:
             return None
@@ -182,7 +192,7 @@ class DataSourcePreset(BaseModel):
             silver=SilverPreset.from_api_obj(obj.silver),
             gold=[GoldPreset.from_api_obj(item) for item in obj.gold],
         )
-    
+
 
 class DataSourcePresetSummary(BaseModel):
     name: Optional[str] = None
@@ -195,7 +205,7 @@ class DataSourcePresetSummary(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1PresetDataSourceListItemsInner],
+        obj: Optional[ContentV1PresetDataSourceListItemsInner],
     ) -> Optional["DataSourcePresetSummary"]:
         if obj is None:
             return None
@@ -210,6 +220,7 @@ class DataSourcePresetSummary(BaseModel):
             icon_url=obj.icon_url,
         )
 
+
 class DataSourcePresetsList(BaseModel):
     kind: Optional[str] = None
     cursor: Optional[str] = None
@@ -217,7 +228,7 @@ class DataSourcePresetsList(BaseModel):
 
     @staticmethod
     def from_api_obj(
-            obj: Optional[ContentV1PresetDataSourceList],
+        obj: Optional[ContentV1PresetDataSourceList],
     ) -> Optional["DataSourcePresetsList"]:
         if obj is None:
             return None
@@ -228,8 +239,5 @@ class DataSourcePresetsList(BaseModel):
         return DataSourcePresetsList(
             kind=obj.kind,
             cursor=cursor,
-            items=[
-                DataSourcePresetSummary.from_api_obj(item)
-                for item in obj.items
-            ],
-        )
+            items=[DataSourcePresetSummary.from_api_obj(item) for item in obj.items],
+        )

dasl_client/types/rule.py

@@ -18,6 +18,7 @@ from dasl_api import (
     CoreV1RuleObservableRisk,
     CoreV1RuleSpecOutput,
     CoreV1RuleSpecCollate,
+    CoreV1RuleSpecInputBatchCustom,
 )
 
 from .helpers import Helpers
@@ -251,9 +252,9 @@ class Rule(BaseModel):
                 Input if the rule should operate on batched input data.
         """
 
-        class Custom(BaseModel):
+        class CustomStream(BaseModel):
             """
-            Specification of a custom notebook for generating input to
+            Specification of a stream custom notebook for generating input to
             the Rule.
 
             Attributes:
@@ -267,10 +268,10 @@ class Rule(BaseModel):
             @staticmethod
             def from_api_obj(
                 obj: Optional[CoreV1RuleSpecInputStreamCustom],
-            ) -> "Rule.Input.Custom":
+            ) -> "Rule.Input.CustomStream":
                 if obj is None:
                     return None
-                return Rule.Input.Custom(
+                return Rule.Input.CustomStream(
                     notebook=obj.notebook,
                     options=obj.options,
                 )
@@ -281,6 +282,36 @@ class Rule(BaseModel):
                     options=self.options,
                 )
 
+        class CustomBatch(BaseModel):
+            """
+            Specification of a batch custom notebook for generating input to
+            the Rule.
+
+            Attributes:
+                notebook (Optional[str]):
+                options (Optional[Dict[str, str]]):
+            """
+
+            notebook: Optional[str] = None
+            options: Optional[Dict[str, str]] = None
+
+            @staticmethod
+            def from_api_obj(
+                obj: Optional[CoreV1RuleSpecInputBatchCustom],
+            ) -> "Rule.Input.CustomBatch":
+                if obj is None:
+                    return None
+                return Rule.Input.CustomBatch(
+                    notebook=obj.notebook,
+                    options=obj.options,
+                )
+
+            def to_api_obj(self) -> CoreV1RuleSpecInputBatchCustom:
+                return CoreV1RuleSpecInputBatchCustom(
+                    notebook=self.notebook,
+                    options=self.options,
+                )
+
         class Stream(BaseModel):
             """
             Specification for streaming input from a table or tables,
@@ -290,7 +321,7 @@ class Rule(BaseModel):
                 tables (Optional[List[Rule.Input.Stream.Table]]):
                 filter (Optional[str]):
                 sql (Optional[str]):
-                custom (Optional[Rule.Input.Custom]):
+                custom (Optional[Rule.Input.CustomStream]):
             """
 
             class Table(BaseModel):
@@ -395,7 +426,7 @@ class Rule(BaseModel):
             tables: Optional[List["Rule.Input.Stream.Table"]] = None
             filter: Optional[str] = None
             sql: Optional[str] = None
-            custom: Optional["Rule.Input.Custom"] = None
+            custom: Optional["Rule.Input.CustomStream"] = None
 
             @staticmethod
             def from_api_obj(
@@ -413,7 +444,7 @@ class Rule(BaseModel):
                     tables=tables,
                     filter=obj.filter,
                     sql=obj.sql,
-                    custom=Rule.Input.Custom.from_api_obj(obj.custom),
+                    custom=Rule.Input.CustomStream.from_api_obj(obj.custom),
                 )
 
             def to_api_obj(self) -> CoreV1RuleSpecInputStream:
@@ -434,11 +465,11 @@ class Rule(BaseModel):
 
             Attributes:
                 sql (Optional[str]):
-                custom (Optional[Rule.Input.Custom]):
+                custom (Optional[Rule.Input.CustomBatch]):
             """
 
             sql: Optional[str] = None
-            custom: Optional["Rule.Input.Custom"] = None
+            custom: Optional["Rule.Input.CustomBatch"] = None
 
             @staticmethod
             def from_api_obj(
@@ -448,7 +479,7 @@ class Rule(BaseModel):
                     return None
                 return Rule.Input.Batch(
                     sql=obj.sql,
-                    custom=Rule.Input.Custom.from_api_obj(obj.custom),
+                    custom=Rule.Input.CustomBatch.from_api_obj(obj.custom),
                 )
 
             def to_api_obj(self) -> CoreV1RuleSpecInputBatch:

dasl_client/types/workspace_config.py

@@ -656,6 +656,7 @@ class WorkspaceConfig(BaseModel):
                 ),
                 observables=Helpers.maybe(to_api_obj, self.observables),
                 dasl_storage_path=self.dasl_storage_path,
+                dasl_custom_presets_path=self.dasl_custom_presets_path,
                 default_config=Helpers.maybe(to_api_obj, self.default_config),
                 managed_retention=managed_retention,
             ),

{dasl_client-1.0.11.dist-info → dasl_client-1.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dasl_client
-Version: 1.0.11
+Version: 1.0.13
 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.14
+Requires-Dist: dasl-api ==0.1.15
 Requires-Dist: databricks-sdk >=0.41.0
 Requires-Dist: pydantic >=2
 Requires-Dist: typing-extensions ==4.10.0

{dasl_client-1.0.11.dist-info → dasl_client-1.0.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dasl_client/__init__.py,sha256=E6gOgO8qg96Y38JKA-4LyNBvc2ytQPEfhdniYsCWBxA,127
-dasl_client/client.py,sha256=6VxOBiIwWKFAI6FX_buW-Pw4qOg19QWHY6sWQmm7d1w,25381
+dasl_client/client.py,sha256=jiILjQOB4OuXXj7J0ZBYEN-pnHm8VQjj1Jqf54eJvS8,25419
 dasl_client/helpers.py,sha256=hi_SrFhEqBuLWOteuQlv__Atzq2VMCgY7A8xSt3ztuA,1035
 dasl_client/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dasl_client/auth/auth.py,sha256=yTeijYYpfJVJ_wYyq0U6kAntg4xz5MzIR37_CpVR57k,7277
@@ -15,15 +15,15 @@ dasl_client/preset_development/preview_parameters.py,sha256=KRk3lTImyvJTeEcepwOS
 dasl_client/preset_development/stage.py,sha256=NiDuFiKvoXgqVPPjzB3TZQN1dQeVff6he6oaSVGwkCs,20154
 dasl_client/types/__init__.py,sha256=GsXC3eWuv21VTLPLPH9pzM95JByaKnKrPjJkh2rlZfQ,170
 dasl_client/types/admin_config.py,sha256=Kmx3Kuai9_LWMeO2NpWasRUgLihYSEXGtuYVfG0FkjU,2200
-dasl_client/types/content.py,sha256=gC3NrKrH7C1bhQv-X4ZGbD1XyutZGzARqfQf7xXJY2M,7299
+dasl_client/types/content.py,sha256=b_4-6rcA6uP0aPN-nBd1QonwQ5Bc4lnrHlL6MKYnl8U,7311
 dasl_client/types/datasource.py,sha256=-ABmBh5yZwHeY-PKQMnNCNa9FSzod5n1O817m8ZCL6o,52519
 dasl_client/types/dbui.py,sha256=RZV_YxCc5KIHLcDLO5Gb1t3KnS8JKN4PbhnYGsVJiws,13200
 dasl_client/types/helpers.py,sha256=gLGTvrssAKrdkQT9h80twEosld2egwhvj-zAudxWFPs,109
-dasl_client/types/rule.py,sha256=NEdTwU8xtJwJHCv6LQIXVHs90XL6NZRF8auTSKr0ypk,24697
+dasl_client/types/rule.py,sha256=BqhWhT8Eh95UXNytd0PxVcjqYuWQcdN1tfKjUB4Tk74,25781
 dasl_client/types/types.py,sha256=DeUOfdYGOhUGEy7yKOfo0OYTXYRrs57yYgNLUbu7Tlc,8806
-dasl_client/types/workspace_config.py,sha256=73O1qNhp15Q5fjq1WYs9cLDkjvLWbaU-ZxFOoN9krWU,24806
-dasl_client-1.0.11.dist-info/LICENSE,sha256=M35UepUPyKmFkvENlkweeaMElheQqNoM5Emh8ADO-rs,4
-dasl_client-1.0.11.dist-info/METADATA,sha256=T-1m_uZqV1mB8itA7vYhpTBZrhoaSAo8XCC3mVcV7Qk,741
-dasl_client-1.0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-dasl_client-1.0.11.dist-info/top_level.txt,sha256=kIv8ox_2oJPjGB8_yuey5vvuPCyfY8kywG138f9oSOY,12
-dasl_client-1.0.11.dist-info/RECORD,,
+dasl_client/types/workspace_config.py,sha256=RThg_THS_4leITWdzBPTWdR2ytq5Uk36m6nIOUMzFCM,24878
+dasl_client-1.0.13.dist-info/LICENSE,sha256=M35UepUPyKmFkvENlkweeaMElheQqNoM5Emh8ADO-rs,4
+dasl_client-1.0.13.dist-info/METADATA,sha256=fXnfud7SFjMSDN_6MTVTwjpDmhV3Rio_ECGDZ36RZIA,741
+dasl_client-1.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+dasl_client-1.0.13.dist-info/top_level.txt,sha256=kIv8ox_2oJPjGB8_yuey5vvuPCyfY8kywG138f9oSOY,12
+dasl_client-1.0.13.dist-info/RECORD,,