datajunction 0.0.1a67__tar.gz → 0.0.1a68.dev0__tar.gz

{datajunction-0.0.1a67 → datajunction-0.0.1a68.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction
-Version: 0.0.1a67
+Version: 0.0.1a68.dev0
 Summary: DataJunction client library for connecting to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>
@@ -15,7 +15,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <4.0,>=3.8
 Requires-Dist: alive-progress>=3.1.2
-Requires-Dist: fastapi-cache2>=0.2.1
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: pytest-xdist>=3.5.0
 Requires-Dist: pyyaml>=6.0.1

datajunction-0.0.1a68.dev0/datajunction/__about__.py

@@ -0,0 +1,4 @@
+"""
+Version for Hatch
+"""
+__version__ = "0.0.1a68.dev0"

{datajunction-0.0.1a67 → datajunction-0.0.1a68.dev0}/datajunction/builder.py

@@ -11,6 +11,7 @@ from datajunction.exceptions import (
     DJClientException,
     DJNamespaceAlreadyExists,
     DJTableAlreadyRegistered,
+    DJTagAlreadyExists,
     DJViewAlreadyRegistered,
 )
 from datajunction.nodes import (
@@ -42,7 +43,11 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
             raise DJClientException(f"Namespace `{namespace}` does not exist.")
         return Namespace(namespace=namespace, dj_client=self)
 
-    def create_namespace(self, namespace: str) -> "Namespace":
+    def create_namespace(
+        self,
+        namespace: str,
+        skip_if_exists: bool = False,
+    ) -> "Namespace":
         """
         Create a namespace with a given name.
         """
@@ -51,7 +56,7 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
             timeout=self._timeout,
         )
         json_response = response.json()
-        if response.status_code == 409:
+        if response.status_code == 409 and not skip_if_exists:
             raise DJNamespaceAlreadyExists(json_response["message"])
         return Namespace(namespace=namespace, dj_client=self)
 
@@ -128,7 +133,7 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         type_: models.NodeType,
         name: str,
         data: Dict,
-        update_if_exists: bool = True,
+        update_if_exists: bool = False,
     ):
         """
         Create or update a new node
@@ -147,24 +152,24 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
                 # This check is for the unit tests, which don't raise an exception
                 # for >= 400 status codes
                 if "name" in cube_dict:
-                    data["metrics"] = cube_dict["cube_node_metrics"]
-                    data["dimensions"] = cube_dict["cube_node_dimensions"]
+                    existing_node_dict["metrics"] = cube_dict["cube_node_metrics"]
+                    existing_node_dict["dimensions"] = cube_dict["cube_node_dimensions"]
         except DJClientException as e:  # pragma: no cover # pytest fixture doesn't raise
             if re.search(r"node .* does not exist", str(e)):
                 existing_node_dict = None
             else:
                 raise
 
-        # pylint: disable=fixme
-        # TODO: checking for "name" in existing_node_dict is a workaround
+        # Checking for "name" in existing_node_dict is a workaround
         #   to accommodate pytest mock client, which return a error message dict (no "name")
         #   instead of raising like the real client.
         if existing_node_dict and "name" in existing_node_dict:
             # update
             if update_if_exists:
+                existing_node_dict.update(data)
                 new_node = self.make_node_of_type(
                     type_=type_,
-                    data=data,
+                    data=existing_node_dict,
                 )
                 new_node._update_tags()
                 new_node._update()
@@ -227,9 +232,9 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         description: Optional[str] = None,
         columns: Optional[List[models.Column]] = None,
         primary_key: Optional[List[str]] = None,
-        tags: Optional[List[Tag]] = None,
+        tags: Optional[List[str]] = None,
         mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        update_if_exists: bool = True,
+        update_if_exists: bool = False,
     ) -> "Source":
         """
         Creates a new Source node with given parameters.
@@ -341,9 +346,9 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         description: Optional[str] = None,
         display_name: Optional[str] = None,
         primary_key: Optional[List[str]] = None,
-        tags: Optional[List[Tag]] = None,
+        tags: Optional[List[str]] = None,
         mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        update_if_exists: bool = True,
+        update_if_exists: bool = False,
     ) -> "Transform":
         """
         Creates or update a Transform node with given parameters.
@@ -373,9 +378,9 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         primary_key: Optional[List[str]] = None,
         description: Optional[str] = None,
         display_name: Optional[str] = None,
-        tags: Optional[List[Tag]] = None,
+        tags: Optional[List[str]] = None,
         mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        update_if_exists: bool = True,
+        update_if_exists: bool = False,
     ) -> "Dimension":
         """
         Creates or update a Dimension node with given parameters.
@@ -407,9 +412,9 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         required_dimensions: Optional[List[str]] = None,
         direction: Optional[models.MetricDirection] = None,
         unit: Optional[models.MetricUnit] = None,
-        tags: Optional[List[Tag]] = None,
+        tags: Optional[List[str]] = None,
         mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        update_if_exists: bool = True,
+        update_if_exists: bool = False,
     ) -> "Metric":
         """
         Creates or update a Metric node with given parameters.
@@ -451,8 +456,8 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
         description: Optional[str] = None,
         display_name: Optional[str] = None,
         mode: Optional[models.NodeMode] = models.NodeMode.PUBLISHED,
-        tags: Optional[List[Tag]] = None,
-        update_if_exists: bool = True,
+        tags: Optional[List[str]] = None,
+        update_if_exists: bool = False,
     ) -> "Cube":
         """
         Create or update a cube with the given parameters.
@@ -476,12 +481,13 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
     #
     # Tag
     #
-    def create_tag(
+    def create_tag(  # pylint: disable=too-many-arguments
         self,
         name: str,
         description: Optional[str],
         tag_metadata: Dict,
         tag_type: str,
+        skip_if_exists: bool = False,
     ) -> Tag:
         """
         Create a tag with a given name.
@@ -493,6 +499,10 @@ class DJBuilder(DJClient):  # pylint: disable=too-many-public-methods
             tag_type=tag_type,
             tag_metadata=tag_metadata,
         )
-        self._create_tag(tag=new_tag)
+        try:
+            self._create_tag(tag=new_tag)
+        except DJTagAlreadyExists as exc:
+            if not skip_if_exists:
+                raise exc
         new_tag.refresh()
         return new_tag