ethyca-fides 2.57.1b0__py2.py3-none-any.whl → 2.57.1b2__py2.py3-none-any.whl

fides/api/models/sql_models.py

@@ -295,15 +295,38 @@ class Dataset(Base, FidesBase):
     collections = Column(JSON)
     fides_meta = Column(JSON)
 
+    @classmethod
+    def create(
+        cls: Type["Dataset"],
+        db: Session,
+        *,
+        data: dict[str, Any],
+        check_name: bool = False,
+    ) -> "Dataset":
+        """
+        Override create to check for existing datasets with the same fides_key.
+        Duplicate names are allowed.
+        """
+        # Check if dataset with same fides_key already exists
+        if "fides_key" in data:
+            existing_by_key = (
+                db.query(cls).filter(cls.fides_key == data["fides_key"]).first()
+            )
+            if existing_by_key:
+                raise KeyOrNameAlreadyExists(
+                    f'Dataset with fides_key "{data["fides_key"]}" already exists.'
+                )
+
+        # Create the dataset using the parent class's method
+        db_obj = cls(**data)
+        return cls.persist_obj(db, db_obj)
+
     @classmethod
     def create_from_dataset_dict(cls, db: Session, dataset: dict) -> "Dataset":
         """Add a method to create directly using a synchronous session"""
         validated_dataset: FideslangDataset = FideslangDataset(**dataset)
-        ctl_dataset = cls(**validated_dataset.model_dump(mode="json"))
-        db.add(ctl_dataset)
-        db.commit()
-        db.refresh(ctl_dataset)
-        return ctl_dataset
+        data_dict = validated_dataset.model_dump(mode="json")
+        return cls.create(db=db, data=data_dict)
 
     @property
     def field_data_categories(self) -> Set[str]:

fides/api/schemas/saas/strategy_configuration.py

@@ -89,6 +89,7 @@ class CursorPaginationConfiguration(StrategyConfiguration):
 
     cursor_param: str
     field: str
+    has_next: Optional[str] = None
 
 
 class ApiKeyAuthenticationConfiguration(StrategyConfiguration):

fides/api/service/pagination/pagination_strategy_cursor.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, Optional
 
 import pydash
+from loguru import logger
 from requests import Response
 
 from fides.api.schemas.saas.shared_schemas import SaaSRequestParams
@@ -15,6 +16,7 @@ class CursorPaginationStrategy(PaginationStrategy):
     def __init__(self, configuration: CursorPaginationConfiguration):
         self.cursor_param = configuration.cursor_param
         self.field = configuration.field
+        self.has_next = configuration.has_next
 
     def get_next_request(
         self,
@@ -27,11 +29,15 @@ class CursorPaginationStrategy(PaginationStrategy):
 
         # get the last object in the array and read the cursor value
         cursor = None
+        has_next = None
         object_list = (
             pydash.get(response.json(), data_path) if data_path else response.json()
         )
         if object_list and isinstance(object_list, list):
-            cursor = pydash.get(object_list.pop(), self.field)
+            last_object = object_list.pop()
+            cursor = pydash.get(last_object, self.field)
+            if self.has_next:
+                has_next = pydash.get(last_object, self.has_next)
 
         # If the cursor value isn't found, try to find the value in response.json() using the field value
         if cursor is None:
@@ -41,6 +47,14 @@ class CursorPaginationStrategy(PaginationStrategy):
         if cursor is None:
             return None
 
+        if self.has_next and has_next is None:
+            has_next = pydash.get(response.json(), self.has_next)
+
+        if self.has_next:
+            logger.debug(f"The {self.has_next} field has a value of {has_next}")
+            if str(has_next).lower() != "true":
+                return None
+
         # add or replace cursor_param with new cursor value
         request_params.query_params[self.cursor_param] = cursor
 

fides/api/service/pagination/pagination_strategy_link.py

@@ -43,7 +43,7 @@ class LinkPaginationStrategy(PaginationStrategy):
 
         if self.has_next:
             has_next = pydash.get(response.json(), self.has_next)
-            logger.info(f"The {self.has_next} field has a value of {has_next}")
+            logger.debug(f"The {self.has_next} field has a value of {has_next}")
             if str(has_next).lower() != "true":
                 return None
 

fides/data/language/languages.yml

@@ -45,6 +45,8 @@ languages:
   name: Italian
 - id: ja
   name: Japanese
+- id: ko
+  name: Korean
 - id: lt
   name: Lithuanian
 - id: lv