ethyca-fides 2.63.3b0__py2.py3-none-any.whl → 2.63.3rc0__py2.py3-none-any.whl

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-12T18:57:31-0300",
+ "date": "2025-06-18T10:17:23-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "14baaf4b4e688a68ff32098124e78e6bab89dcb5",
- "version": "2.63.3b0"
+ "full-revisionid": "21a5a1a7cbc29691214ef6286321eec2cc2a002b",
+ "version": "2.63.3rc0"
 }
 '''  # END VERSION_JSON
 

fides/api/api/v1/endpoints/connection_endpoints.py

@@ -22,7 +22,6 @@ from fides.api.schemas.connection_configuration import connection_secrets_schema
 from fides.api.schemas.connection_configuration.connection_config import (
     BulkPutConnectionConfiguration,
     ConnectionConfigurationResponse,
-    ConnectionConfigurationResponseWithSystemKey,
     CreateConnectionConfigurationWithSecrets,
 )
 from fides.api.schemas.connection_configuration.connection_secrets import (
@@ -155,25 +154,13 @@ def get_connections(
 @router.get(
     CONNECTION_BY_KEY,
     dependencies=[Security(verify_oauth_client, scopes=[CONNECTION_READ])],
-    response_model=ConnectionConfigurationResponseWithSystemKey,
+    response_model=ConnectionConfigurationResponse,
 )
 def get_connection_detail(
     connection_key: FidesKey, db: Session = Depends(deps.get_db)
-) -> ConnectionConfigurationResponseWithSystemKey:
+) -> ConnectionConfig:
     """Returns connection configuration with matching key."""
-    connection_config = get_connection_config_or_error(db, connection_key)
-
-    # Convert to Pydantic model with all fields
-    response = ConnectionConfigurationResponseWithSystemKey.model_validate(
-        connection_config
-    )
-
-    # Override just the system_key field to use only the system's fides_key without fallback
-    response.system_key = (
-        connection_config.system.fides_key if connection_config.system else None
-    )
-
-    return response
+    return get_connection_config_or_error(db, connection_key)
 
 
 @router.patch(

fides/api/api/v1/endpoints/oauth_endpoints.py

@@ -274,15 +274,9 @@ def oauth_callback(code: str, state: str, db: Session = Depends(get_db)) -> Resp
 
             parsed_url = urlparse(authentication_request.referer)
             base_url = f"{parsed_url.scheme}://{parsed_url.netloc}"
-
-            if connection_config.system is not None:
-                system_key = connection_config.system.fides_key
-                redirect_path = f"/systems/configure/{system_key}"
-            else:
-                redirect_path = f"/integrations/{connection_config.key}"
-
+            system_key = connection_config.system.fides_key
             return RedirectResponse(
-                url=f"{base_url}{redirect_path}?status={test_status_value}"
+                url=f"{base_url}/systems/configure/{system_key}?status={test_status_value}"
             )
         return PlainTextResponse(
             content=f"Connection test status: {test_status_value}. No referer URL available. Please navigate back to the Fides Admin UI.",

fides/api/models/attachment.py

@@ -1,6 +1,5 @@
 import os
 from enum import Enum as EnumType
-from io import BytesIO
 from typing import IO, TYPE_CHECKING, Any, Tuple
 
 from fideslang.validation import AnyHttpUrlString
@@ -20,6 +19,7 @@ from fides.api.service.storage.s3 import (
     generic_upload_to_s3,
 )
 from fides.api.service.storage.util import AllowedFileType, get_local_filename
+from fides.config import CONFIG
 
 if TYPE_CHECKING:
     from fides.api.models.comment import Comment
@@ -28,11 +28,6 @@ if TYPE_CHECKING:
     from fides.api.models.storage import StorageConfig
 
 
-# This is 7 days in seconds and is currently the max allowed
-# configurable expiration time for presigned URLs for both s3 and gcs.
-MAX_TTL_SECONDS = 604800
-
-
 class AttachmentType(str, EnumType):
     """
     Enum for attachment types. Indicates attachment usage.
@@ -127,11 +122,6 @@ class Attachment(Base):
         """Returns the content type of the attachment."""
         return AllowedFileType[self.file_name.split(".")[-1]].value
 
-    @property
-    def file_key(self) -> str:
-        """Returns the file key of the attachment."""
-        return f"{self.id}/{self.file_name}"
-
     def upload(self, attachment: IO[bytes]) -> None:
         """Uploads an attachment to S3, GCS, or local storage."""
         if self.config.type == StorageType.s3:
@@ -140,7 +130,7 @@ class Attachment(Base):
             generic_upload_to_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.file_key,
+                file_key=f"{self.id}/{self.file_name}",
                 document=attachment,
                 auth_method=auth_method,
             )
@@ -152,7 +142,7 @@ class Attachment(Base):
             auth_method = self.config.details[StorageDetails.AUTH_METHOD.value]
             storage_client = get_gcs_client(auth_method, self.config.secrets)
             bucket = storage_client.bucket(bucket_name)
-            blob = bucket.blob(self.file_key)
+            blob = bucket.blob(f"{self.id}/{self.file_name}")
 
             # Reset the file pointer to the beginning
             try:
@@ -165,7 +155,7 @@ class Attachment(Base):
             return
 
         if self.config.type == StorageType.local:
-            filename = get_local_filename(self.file_key)
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
 
             # Validate that attachment is a file-like object
             if not hasattr(attachment, "read"):
@@ -215,10 +205,9 @@ class Attachment(Base):
             size, url = generic_retrieve_from_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.file_key,
+                file_key=f"{self.id}/{self.file_name}",
                 auth_method=auth_method,
                 get_content=False,
-                ttl_seconds=MAX_TTL_SECONDS,
             )
             return size, url
 
@@ -227,20 +216,19 @@ class Attachment(Base):
             auth_method = self.config.details[StorageDetails.AUTH_METHOD.value]
             storage_client = get_gcs_client(auth_method, self.config.secrets)
             bucket = storage_client.bucket(bucket_name)
-            blob = bucket.blob(self.file_key)
+            blob = bucket.blob(f"{self.id}/{self.file_name}")
 
             # Ensure we have the blob metadata
             blob.reload()
-            # Expiration is set to 7 days
             url = blob.generate_signed_url(
                 version="v4",
-                expiration=MAX_TTL_SECONDS,
+                expiration=CONFIG.security.subject_request_download_link_ttl_seconds,
                 method="GET",
             )
             return blob.size, url
 
         if self.config.type == StorageType.local:
-            filename = get_local_filename(self.file_key)
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
             size = os.path.getsize(filename)
             return size, filename
 
@@ -248,7 +236,7 @@ class Attachment(Base):
 
     def retrieve_attachment_content(
         self,
-    ) -> Tuple[int, IO[bytes]]:
+    ) -> Tuple[int, bytes]:
         """
         Retrieves the size of the attachment and its actual content.
         - For s3:
@@ -264,33 +252,30 @@ class Attachment(Base):
         if self.config.type == StorageType.s3:
             bucket_name = f"{self.config.details[StorageDetails.BUCKET.value]}"
             auth_method = self.config.details[StorageDetails.AUTH_METHOD.value]
-            size, fileobj = generic_retrieve_from_s3(
+            size, content = generic_retrieve_from_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.file_key,
+                file_key=f"{self.id}/{self.file_name}",
                 auth_method=auth_method,
                 get_content=True,
             )
-            return size, fileobj
+            return size, content
 
         if self.config.type == StorageType.gcs:
             bucket_name = f"{self.config.details[StorageDetails.BUCKET.value]}"
             auth_method = self.config.details[StorageDetails.AUTH_METHOD.value]
             storage_client = get_gcs_client(auth_method, self.config.secrets)
             bucket = storage_client.bucket(bucket_name)
-            blob = bucket.blob(self.file_key)
+            blob = bucket.blob(f"{self.id}/{self.file_name}")
 
-            fileobj = BytesIO()
-            blob.download_to_file(fileobj)
-            fileobj.seek(0)  # Reset pointer to beginning after download
-            return blob.size, fileobj
+            content = blob.download_as_bytes()
+            return len(content), content
 
         if self.config.type == StorageType.local:
-            filename = get_local_filename(self.file_key)
-            size = os.path.getsize(filename)
-            with open(filename, "rb") as fileobj:
-                content = BytesIO(fileobj.read())
-                content.seek(0)  # Reset pointer to beginning
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
+            with open(filename, "rb") as file:
+                content = file.read()
+                size = len(content)
                 return size, content
 
         raise ValueError(f"Unsupported storage type: {self.config.type}")
@@ -303,7 +288,7 @@ class Attachment(Base):
             generic_delete_from_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.file_key,
+                file_key=f"{self.id}/{self.file_name}",
                 auth_method=auth_method,
             )
             return
@@ -322,7 +307,9 @@ class Attachment(Base):
             return
 
         if self.config.type == StorageType.local:
-            folder_path = os.path.dirname(get_local_filename(self.file_key))
+            folder_path = os.path.dirname(
+                get_local_filename(f"{self.id}/{self.file_name}")
+            )
             if os.path.exists(folder_path):
                 import shutil
 

fides/api/schemas/connection_configuration/connection_config.py

@@ -111,10 +111,10 @@ class ConnectionConfigSecretsMixin(BaseModel):
         return self
 
 
-class ConnectionConfigurationResponseBase(ConnectionConfigSecretsMixin):
+class ConnectionConfigurationResponse(ConnectionConfigSecretsMixin):
     """
-    Base schema for ConnectionConfiguration responses,
-    excluding fields that might be conditionally omitted.
+    Describes the returned schema for a ConnectionConfiguration.
+
     The mixin base class ensures that `secrets` sensitive values are masked.
     """
 
@@ -129,23 +129,8 @@ class ConnectionConfigurationResponseBase(ConnectionConfigSecretsMixin):
     last_test_succeeded: Optional[bool] = None
     authorized: Optional[bool] = False
     enabled_actions: Optional[List[ActionType]] = None
-    model_config = ConfigDict(from_attributes=True)
-
-
-class ConnectionConfigurationResponseWithSystemKey(ConnectionConfigurationResponseBase):
-    """
-    Describes the full returned schema for a ConnectionConfiguration.
-    """
 
-    # Using this response with models returned from an async DB session will error
-    # because the system_key is lazy loaded. Just a quirk of SQLAlchemy 1.4.
-    system_key: Optional[str] = None
-
-
-class ConnectionConfigurationResponse(ConnectionConfigurationResponseBase):
-    """
-    Describes the returned schema for a ConnectionConfiguration.
-    """
+    model_config = ConfigDict(from_attributes=True)
 
 
 class BulkPutConnectionConfiguration(BulkResponse):

fides/api/service/connectors/query_configs/saas_query_config.py

@@ -43,7 +43,6 @@ from fides.api.util.saas_util import (
     ALL_OBJECT_FIELDS,
     CUSTOM_PRIVACY_REQUEST_FIELDS,
     FIDESOPS_GROUPED_INPUTS,
-    FIELD_LIST,
     ISO_8601_DATETIME,
     MASKED_OBJECT_FIELDS,
     PRIVACY_REQUEST_ID,
@@ -354,13 +353,6 @@ class SaaSQueryConfig(QueryConfig[SaaSRequestParams]):
 
         param_values[UUID] = str(uuid4())
         param_values[ISO_8601_DATETIME] = datetime.now().date().isoformat()
-        param_values[FIELD_LIST] = ",".join(
-            [
-                field.name
-                for field in self.top_level_field_map().values()
-                if field.data_type() != "None"
-            ]
-        )
         if self.request_task and self.request_task.id:
             param_values[REPLY_TO_TOKEN] = generate_request_task_callback_jwe(
                 self.request_task
@@ -466,13 +458,6 @@ class SaaSQueryConfig(QueryConfig[SaaSRequestParams]):
         param_values[CUSTOM_PRIVACY_REQUEST_FIELDS] = custom_privacy_request_fields
         param_values[UUID] = str(uuid4())
         param_values[ISO_8601_DATETIME] = datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ")
-        param_values[FIELD_LIST] = ",".join(
-            [
-                field.name
-                for field in self.top_level_field_map().values()
-                if field.data_type() != "None"
-            ]
-        )
         if self.request_task and self.request_task.id:
             param_values[REPLY_TO_TOKEN] = generate_request_task_callback_jwe(
                 self.request_task