datamasque-python 1.1.8__py3-none-any.whl → 1.2.0__py3-none-any.whl

datamasque/client/discovery_config_libraries.py

@@ -3,7 +3,6 @@ from typing import Optional
 
 from datamasque.client.base import BaseClient
 from datamasque.client.exceptions import DataMasqueApiError
-from datamasque.client.models.discovery_config import DiscoveryConfigType
 from datamasque.client.models.discovery_config_library import DiscoveryConfigLibrary, DiscoveryConfigLibraryId
 
 logger = logging.getLogger(__name__)
@@ -31,14 +30,12 @@ class DiscoveryConfigLibraryClient(BaseClient):
         response = self.make_request("GET", f"/api/discovery/config-libraries/{library_id}/")
         return DiscoveryConfigLibrary.model_validate(response.json())
 
-    def _get_discovery_config_library_id_by_name(
-        self, name: str, config_type: DiscoveryConfigType, namespace: str
-    ) -> Optional[DiscoveryConfigLibraryId]:
+    def _get_discovery_config_library_id_by_name(self, name: str, namespace: str) -> Optional[DiscoveryConfigLibraryId]:
         """
-        Returns the ID of the library with the given name, type, and namespace, or `None` if there is none.
+        Returns the ID of the library with the given name and namespace, or `None` if there is none.
 
         The listing is filtered by name to keep the response small;
-        type and namespace are matched client-side,
+        the namespace is matched client-side,
         since the API's namespace filter cannot select the default (empty) namespace.
         """
 
@@ -48,11 +45,7 @@ class DiscoveryConfigLibraryClient(BaseClient):
             params={"name_exact": name},
         )
         entries = [DiscoveryConfigLibrary.model_validate(item) for item in response.json()]
-        matches = [
-            entry
-            for entry in entries
-            if entry.name == name and entry.namespace == namespace and entry.config_type is config_type
-        ]
+        matches = [entry for entry in entries if entry.name == name and entry.namespace == namespace]
         if not matches:
             return None
 
@@ -64,18 +57,15 @@ class DiscoveryConfigLibraryClient(BaseClient):
 
         return matches[0].id
 
-    def get_discovery_config_library_by_name(
-        self, name: str, config_type: DiscoveryConfigType, namespace: str = ""
-    ) -> Optional[DiscoveryConfigLibrary]:
+    def get_discovery_config_library_by_name(self, name: str, namespace: str = "") -> Optional[DiscoveryConfigLibrary]:
         """
-        Looks for a discovery config library matching the given name, type, and namespace (case-sensitive, exact match).
+        Looks for a discovery config library matching the given name and namespace (case-sensitive, exact match).
 
-        Library names are unique per type within a namespace,
-        so a type is required to identify a single library.
+        Library names are unique within a namespace.
         Returns it (with full YAML content) if found, otherwise `None`.
         """
 
-        library_id = self._get_discovery_config_library_id_by_name(name, config_type, namespace)
+        library_id = self._get_discovery_config_library_id_by_name(name, namespace)
         if library_id is None:
             return None
 
@@ -106,7 +96,6 @@ class DiscoveryConfigLibraryClient(BaseClient):
 
         The library must have its `id` set (i.e., it must have been previously created or retrieved from the server)
         and its `yaml` content present.
-        A library's `config_type` is fixed at creation and cannot be changed by an update.
         """
 
         if library.id is None:
@@ -129,12 +118,12 @@ class DiscoveryConfigLibraryClient(BaseClient):
 
     def create_or_update_discovery_config_library(self, library: DiscoveryConfigLibrary) -> DiscoveryConfigLibrary:
         """
-        Creates the library, or updates the existing one with the same name, namespace, and config type.
+        Creates the library, or updates the existing one with the same name and namespace.
 
         Sets the library's `id` property.
         """
 
-        library_id = self._get_discovery_config_library_id_by_name(library.name, library.config_type, library.namespace)
+        library_id = self._get_discovery_config_library_id_by_name(library.name, library.namespace)
         if library_id is not None:
             library.id = library_id
             return self.update_discovery_config_library(library)
@@ -157,16 +146,15 @@ class DiscoveryConfigLibraryClient(BaseClient):
         self._delete_if_exists(f"/api/discovery/config-libraries/{library_id}/", params=params)
 
     def delete_discovery_config_library_by_name_if_exists(
-        self, name: str, config_type: DiscoveryConfigType, namespace: str = "", *, force: bool = False
+        self, name: str, namespace: str = "", *, force: bool = False
     ) -> None:
         """
-        Deletes the discovery config library with the given name, type, and namespace.
+        Deletes the discovery config library with the given name and namespace.
 
-        Library names are unique per type within a namespace,
-        so a type is required to identify a single library.
+        Library names are unique within a namespace.
         No-op if no such library exists.
         """
 
-        library_id = self._get_discovery_config_library_id_by_name(name, config_type, namespace)
+        library_id = self._get_discovery_config_library_id_by_name(name, namespace)
         if library_id is not None:
             self.delete_discovery_config_library_by_id_if_exists(library_id, force=force)

datamasque/client/models/discovery_config_library.py

@@ -3,7 +3,6 @@ from typing import NewType, Optional
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from datamasque.client.models.discovery_config import DiscoveryConfigType
 from datamasque.client.models.status import ValidationStatus
 
 DiscoveryConfigLibraryId = NewType("DiscoveryConfigLibraryId", str)
@@ -13,14 +12,13 @@ class DiscoveryConfigLibrary(BaseModel):
     """
     Represents a named, namespaced, persisted YAML discovery config library.
 
-    Library names are unique per config type within a namespace,
-    so a database and a file library may share a name.
+    A library is untyped: the same library may be imported by both database and
+    file discovery configs, and its name is unique within a namespace.
     """
 
     model_config = ConfigDict(extra="allow", populate_by_name=True)
 
     name: str
-    config_type: DiscoveryConfigType
     namespace: str = ""
     yaml: Optional[str] = Field(default=None, alias="config_yaml")
     # Server-populated read-only fields, excluded from request bodies.

{datamasque_python-1.1.8.dist-info → datamasque_python-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamasque-python
-Version: 1.1.8
+Version: 1.2.0
 Summary: Official Python client for the DataMasque data-masking API.
 Project-URL: Homepage, https://datamasque.com/
 Project-URL: Documentation, https://datamasque-python.readthedocs.io/

{datamasque_python-1.1.8.dist-info → datamasque_python-1.2.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ datamasque/client/__init__.py,sha256=Tq3xY-x3yQj5E05q5YJFxXzpYYEu_eOiKSGmX-IINHI
 datamasque/client/base.py,sha256=cXU4dluL9e1N1F2pV48iIvebv6OHt7Kh4Ka2y9vkOPo,14296
 datamasque/client/connections.py,sha256=EFinx8fJRme0mTxuWY3d29UnmUFbsQhMaUQT0Ma2PK4,2885
 datamasque/client/discovery.py,sha256=MTDiif6YWkv64hHXZ8YJxtRhoeKIvQVfjNYvjCIZCXE,21261
-datamasque/client/discovery_config_libraries.py,sha256=Ne8vzY9NDoY11O2HCSA8le9KiTlJPSoznKy3PL05lqY,7628
+datamasque/client/discovery_config_libraries.py,sha256=bwuBTCnJUSnOyTz_I-_D6uS3wcRJh3ZRtfv2AOyMnmY,7024
 datamasque/client/discovery_configs.py,sha256=G-W-X_KizjjQLa-Rb6ixLjlkxbkCe4WGCOfYZrGtxIk,6420
 datamasque/client/dmclient.py,sha256=w8aloPHL8YGKfESUzn62G9XrVovDoGlqrktX_KuDL7U,1864
 datamasque/client/exceptions.py,sha256=YpM_vhnl31_02KQmx-NPP2AxR3gKYcmcxyb_35G9HVw,3755
@@ -22,7 +22,7 @@ datamasque/client/models/connection.py,sha256=loLy4RCiIfY9kvBFspSqJSRhHqhcJxm_mQ
 datamasque/client/models/data_selection.py,sha256=406yyUZ5NmLBSql2lYM1gsTWY5GWmnutmF-DjznAoLc,1904
 datamasque/client/models/discovery.py,sha256=w3DXPux15BDMVs5urTpU2DM8pnWUzS3LFzCr6ctymxk,13517
 datamasque/client/models/discovery_config.py,sha256=1CHMgSxMXuarPGfRcz9wX7jeZLn1SDw0UEe-L5naE54,1917
-datamasque/client/models/discovery_config_library.py,sha256=5MLIe3SCQ6IbhWbZ_avDL9H65fW4O5h3HtjlgEfcFGg,1378
+datamasque/client/models/discovery_config_library.py,sha256=NW4bhrlpps_SyJcX07W-dfQ_i9C0OH3O0b9TQcXPl1w,1298
 datamasque/client/models/dm_instance.py,sha256=6h0WNlI1qt6jkrYFapIvuSJFkhRCcwbpx0PLG5NsrGw,2219
 datamasque/client/models/files.py,sha256=7hG3Q1-XYb1PF88l3ppsmBp2tjNtvQvv-RNTrOa7Nts,2784
 datamasque/client/models/git.py,sha256=F0KdMFe2vMyL-9tp3SGKGeOlbD1gbcjQn0jpOzNzybc,1782
@@ -36,7 +36,7 @@ datamasque/client/models/safe_data_preview.py,sha256=BiI9d13KdQrTin2JfbjiRiODjns
 datamasque/client/models/status.py,sha256=WiSMEy_YxdcIA46ioYpAEu8OK8UNDoXpV1W7IUhhyVY,3219
 datamasque/client/models/table_reference.py,sha256=55fKdHjC2TQnUmbp0XiWqfeFGXqcq4wXjbWgMaN3p3c,3835
 datamasque/client/models/user.py,sha256=UGAUzgJkf78m24_zFXXoA99zdut48BXkX_ivV8yq1Vc,2043
-datamasque_python-1.1.8.dist-info/METADATA,sha256=_uqOykCTG6M-qHCHbFxWOIzY5hNpxh2L2GOYfrH4Zr0,4497
-datamasque_python-1.1.8.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-datamasque_python-1.1.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-datamasque_python-1.1.8.dist-info/RECORD,,
+datamasque_python-1.2.0.dist-info/METADATA,sha256=9PUXw1BVSYhSjvPC6YaRVwSlCDrdG0GITMsRw6JA2FE,4497
+datamasque_python-1.2.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+datamasque_python-1.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+datamasque_python-1.2.0.dist-info/RECORD,,