ethyca-fides 2.64.1b1__tar.gz → 2.64.1rc0__tar.gz

{ethyca_fides-2.64.1b1/src/ethyca_fides.egg-info → ethyca_fides-2.64.1rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.64.1b1
+Version: 2.64.1rc0
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.
@@ -33,7 +33,7 @@ Requires-Dist: deepdiff==6.3.0
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: types-defusedxml==0.7.0.20240218
 Requires-Dist: expandvars==0.9.0
-Requires-Dist: fastapi[all]==0.115.2
+Requires-Dist: fastapi[all]==0.111.0
 Requires-Dist: fastapi-pagination[sqlalchemy]==0.12.25
 Requires-Dist: fideslog==1.2.10
 Requires-Dist: firebase-admin==5.3.0

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/requirements.txt

@@ -17,7 +17,7 @@ deepdiff==6.3.0
 defusedxml==0.7.1
 types-defusedxml==0.7.0.20240218
 expandvars==0.9.0
-fastapi[all]==0.115.2
+fastapi[all]==0.111.0
 fastapi-pagination[sqlalchemy]==0.12.25
 fideslog==1.2.10
 firebase-admin==5.3.0

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0/src/ethyca_fides.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.64.1b1
+Version: 2.64.1rc0
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.
@@ -33,7 +33,7 @@ Requires-Dist: deepdiff==6.3.0
 Requires-Dist: defusedxml==0.7.1
 Requires-Dist: types-defusedxml==0.7.0.20240218
 Requires-Dist: expandvars==0.9.0
-Requires-Dist: fastapi[all]==0.115.2
+Requires-Dist: fastapi[all]==0.111.0
 Requires-Dist: fastapi-pagination[sqlalchemy]==0.12.25
 Requires-Dist: fideslog==1.2.10
 Requires-Dist: firebase-admin==5.3.0

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/ethyca_fides.egg-info/SOURCES.txt

@@ -151,7 +151,6 @@ src/fides/api/alembic/migrations/versions/68c590ff6e89_add_rds_mysql_to_connecto
 src/fides/api/alembic/migrations/versions/68cb26f3492d_remove_client_id_constraint.py
 src/fides/api/alembic/migrations/versions/69ad6d844e21_add_comments_and_comment_references.py
 src/fides/api/alembic/migrations/versions/69e51a460e66_add_plus_privacy_experience_config_table.py
-src/fides/api/alembic/migrations/versions/6a76a1fa4f3f_add_manual_task_instance_table.py
 src/fides/api/alembic/migrations/versions/6b287ff8cde4_penultimate_ops_merge.py
 src/fides/api/alembic/migrations/versions/6b9885e68cbb_add_plus_system_scans_table.py
 src/fides/api/alembic/migrations/versions/6bd93cb0603d_add_egress_and_ingress_to_systems.py
@@ -436,7 +435,6 @@ src/fides/api/models/field_types/encrypted_large_data.py
 src/fides/api/models/manual_tasks/__init__.py
 src/fides/api/models/manual_tasks/manual_task.py
 src/fides/api/models/manual_tasks/manual_task_config.py
-src/fides/api/models/manual_tasks/manual_task_instance.py
 src/fides/api/models/manual_tasks/manual_task_log.py
 src/fides/api/models/privacy_request/__init__.py
 src/fides/api/models/privacy_request/consent.py
@@ -824,7 +822,6 @@ src/fides/service/dataset/validation_steps/saas.py
 src/fides/service/dataset/validation_steps/traversal.py
 src/fides/service/manual_tasks/__init__.py
 src/fides/service/manual_tasks/manual_task_config_service.py
-src/fides/service/manual_tasks/manual_task_instance_service.py
 src/fides/service/manual_tasks/manual_task_service.py
 src/fides/service/manual_tasks/utils.py
 src/fides/service/messaging/__init__.py
@@ -889,7 +886,7 @@ src/fides/ui-build/static/admin/_next/static/chunks/618f8807-d15c33d1d6c8b961.js
 src/fides/ui-build/static/admin/_next/static/chunks/6277-3fb4c7fc790a6d20.js
 src/fides/ui-build/static/admin/_next/static/chunks/6527-0eed08abe252a918.js
 src/fides/ui-build/static/admin/_next/static/chunks/6659-b2088f525bf13c17.js
-src/fides/ui-build/static/admin/_next/static/chunks/6662-cb11881dcaabe5e2.js
+src/fides/ui-build/static/admin/_next/static/chunks/6662-6a6b90fc8f11558f.js
 src/fides/ui-build/static/admin/_next/static/chunks/678d4732-50255cc09048e643.js
 src/fides/ui-build/static/admin/_next/static/chunks/6853-a4097260e402980e.js
 src/fides/ui-build/static/admin/_next/static/chunks/6882-3cc73d407a088d7d.js
@@ -1016,6 +1013,8 @@ src/fides/ui-build/static/admin/_next/static/css/c693338e3bc8dcc6.css
 src/fides/ui-build/static/admin/_next/static/css/d2d4e9a6923e6730.css
 src/fides/ui-build/static/admin/_next/static/css/e458b5f1afdbb7fc.css
 src/fides/ui-build/static/admin/_next/static/css/eb46b504bb5d980d.css
+src/fides/ui-build/static/admin/_next/static/hCJxUAFBWobWrps6RkP0K/_buildManifest.js
+src/fides/ui-build/static/admin/_next/static/hCJxUAFBWobWrps6RkP0K/_ssgManifest.js
 src/fides/ui-build/static/admin/_next/static/media/inter-all-400-normal.2ae8ed37.woff
 src/fides/ui-build/static/admin/_next/static/media/inter-all-500-normal.56c3d87b.woff
 src/fides/ui-build/static/admin/_next/static/media/inter-all-600-normal.d9666969.woff
@@ -1049,8 +1048,6 @@ src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-500-normal.7
 src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-600-normal.eb82de1d.woff2
 src/fides/ui-build/static/admin/_next/static/media/inter-vietnamese-700-normal.00e401a9.woff2
 src/fides/ui-build/static/admin/_next/static/media/logo-white.c9bf4196.svg
-src/fides/ui-build/static/admin/_next/static/zBkPKRGECPjwEx0G7BvHe/_buildManifest.js
-src/fides/ui-build/static/admin/_next/static/zBkPKRGECPjwEx0G7BvHe/_ssgManifest.js
 src/fides/ui-build/static/admin/add-systems/manual.html
 src/fides/ui-build/static/admin/add-systems/multiple.html
 src/fides/ui-build/static/admin/consent/configure.html

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/ethyca_fides.egg-info/requires.txt

@@ -17,7 +17,7 @@ deepdiff==6.3.0
 defusedxml==0.7.1
 types-defusedxml==0.7.0.20240218
 expandvars==0.9.0
-fastapi[all]==0.115.2
+fastapi[all]==0.111.0
 fastapi-pagination[sqlalchemy]==0.12.25
 fideslog==1.2.10
 firebase-admin==5.3.0

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-19T11:51:39-0400",
+ "date": "2025-06-24T11:20:40-0400",
  "dirty": true,
  "error": null,
- "full-revisionid": "6d40335efb663c9f4f6d4a69bfdf8a3360d3f1f7",
- "version": "2.64.1b1"
+ "full-revisionid": "21463b495627cf56ebf6405ae00a63c0c1184d53",
+ "version": "2.64.1rc0"
 }
 '''  # END VERSION_JSON
 

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/db/base.py

@@ -36,10 +36,6 @@ from fides.api.models.manual_tasks.manual_task_config import (
     ManualTaskConfig,
     ManualTaskConfigField,
 )
-from fides.api.models.manual_tasks.manual_task_instance import (
-    ManualTaskInstance,
-    ManualTaskSubmission,
-)
 from fides.api.models.manual_tasks.manual_task_log import ManualTaskLog
 from fides.api.models.manual_webhook import AccessManualWebhook
 from fides.api.models.messaging import MessagingConfig

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/models/manual_tasks/__init__.py

@@ -3,18 +3,12 @@ from fides.api.models.manual_tasks.manual_task_config import (
     ManualTaskConfig,
     ManualTaskConfigField,
 )
-from fides.api.models.manual_tasks.manual_task_instance import (
-    ManualTaskInstance,
-    ManualTaskSubmission,
-)
 from fides.api.models.manual_tasks.manual_task_log import ManualTaskLog
 
 __all__ = [
     "ManualTask",
     "ManualTaskConfig",
     "ManualTaskConfigField",
-    "ManualTaskInstance",
-    "ManualTaskLog",
     "ManualTaskReference",
-    "ManualTaskSubmission",
+    "ManualTaskLog",
 ]

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/models/manual_tasks/manual_task.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING, Any
 
-from sqlalchemy import Column, ForeignKey, String
+from sqlalchemy import Column, DateTime, ForeignKey, String
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import Session, relationship
 
@@ -18,10 +18,6 @@ if TYPE_CHECKING:  # pragma: no cover
     from fides.api.models.manual_tasks.manual_task_config import (  # pragma: no cover
         ManualTaskConfig,
     )
-    from fides.api.models.manual_tasks.manual_task_instance import (
-        ManualTaskInstance,
-        ManualTaskSubmission,
-    )
 
 
 class ManualTask(Base):
@@ -52,6 +48,7 @@ class ManualTask(Base):
         nullable=False,
         default=ManualTaskParentEntityType.connection_config,
     )
+    due_date = Column(DateTime, nullable=True)
 
     # Relationships
     references = relationship(
@@ -71,19 +68,6 @@ class ManualTask(Base):
         "ManualTaskConfig",
         back_populates="task",
         cascade="all, delete-orphan",
-        uselist=True,
-    )
-    instances = relationship(
-        "ManualTaskInstance",
-        back_populates="task",
-        viewonly=True,
-        uselist=True,
-    )
-    submissions = relationship(
-        "ManualTaskSubmission",
-        back_populates="task",
-        uselist=True,
-        viewonly=True,
     )
 
     # Properties
@@ -133,4 +117,4 @@ class ManualTaskReference(Base):
     reference_type = Column(EnumColumn(ManualTaskReferenceType), nullable=False)
 
     # Relationships
-    task = relationship("ManualTask", back_populates="references", viewonly=True)
+    task = relationship("ManualTask", back_populates="references")

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/models/manual_tasks/manual_task_config.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional
 
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.dialects.postgresql import JSONB
@@ -13,19 +13,10 @@ from fides.api.schemas.manual_tasks.manual_task_config import (
     ManualTaskFieldMetadata,
     ManualTaskFieldType,
 )
-from fides.api.schemas.manual_tasks.manual_task_schemas import (
-    ManualTaskExecutionTiming,
-    ManualTaskLogStatus,
-)
+from fides.api.schemas.manual_tasks.manual_task_schemas import ManualTaskLogStatus
 
 if TYPE_CHECKING:  # pragma: no cover
     from fides.api.models.manual_tasks.manual_task import ManualTask  # pragma: no cover
-    from fides.api.models.manual_tasks.manual_task_instance import (
-        ManualTaskInstance,  # pragma: no cover
-    )
-    from fides.api.models.manual_tasks.manual_task_instance import (
-        ManualTaskSubmission,  # pragma: no cover
-    )
 
 
 class ManualTaskConfig(Base):
@@ -41,20 +32,9 @@ class ManualTaskConfig(Base):
     config_type = Column(EnumColumn(ManualTaskConfigurationType), nullable=False)
     version = Column(Integer, nullable=False, default=1)
     is_current = Column(Boolean, nullable=False, default=True)
-    execution_timing = Column(
-        EnumColumn(ManualTaskExecutionTiming),
-        nullable=False,
-        default=ManualTaskExecutionTiming.pre_execution,
-    )
 
     # Relationships
-    task = relationship("ManualTask", back_populates="configs", viewonly=True)
-    instances = relationship(
-        "ManualTaskInstance", back_populates="config", uselist=True, viewonly=True
-    )
-    submissions = relationship(
-        "ManualTaskSubmission", back_populates="config", uselist=True, viewonly=True
-    )
+    task = relationship("ManualTask", back_populates="configs")
     field_definitions = relationship(
         "ManualTaskConfigField",
         back_populates="config",
@@ -65,7 +45,7 @@ class ManualTaskConfig(Base):
         "ManualTaskLog",
         back_populates="config",
         primaryjoin="ManualTaskConfig.id == ManualTaskLog.config_id",
-        cascade="all, delete-orphan",
+        viewonly=True,
     )
 
     @classmethod
@@ -115,27 +95,14 @@ class ManualTaskConfigField(Base):
     field_type = Column(
         EnumColumn(ManualTaskFieldType), nullable=False
     )  # Using ManualTaskFieldType
-    field_metadata: dict[str, Any] = cast(
-        dict[str, Any], Column(JSONB, nullable=False, default={})
-    )
+    field_metadata = Column(JSONB, nullable=False, default={})
 
     # Relationships
-    config = relationship(
-        "ManualTaskConfig", back_populates="field_definitions", viewonly=True
-    )
-    submissions = relationship(
-        "ManualTaskSubmission",
-        back_populates="field",
-        uselist=True,
-        cascade="all, delete-orphan",
-    )
+    config = relationship("ManualTaskConfig", back_populates="field_definitions")
 
     @property
     def field_metadata_model(self) -> ManualTaskFieldMetadata:
         """Get the field metadata as a Pydantic model."""
-        assert isinstance(
-            self.field_metadata, dict
-        ), "field_metadata must be a dictionary"
         return ManualTaskFieldMetadata.model_validate(self.field_metadata)
 
     @classmethod

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/models/manual_tasks/manual_task_log.py

@@ -13,9 +13,6 @@ if TYPE_CHECKING:  # pragma: no cover
     from fides.api.models.manual_tasks.manual_task_config import (
         ManualTaskConfig,  # pragma: no cover
     )
-    from fides.api.models.manual_tasks.manual_task_instance import (  # pragma: no cover
-        ManualTaskInstance,
-    )
 
 
 class ManualTaskLog(Base):
@@ -29,29 +26,19 @@ class ManualTaskLog(Base):
     task_id = Column(
         String, ForeignKey("manual_task.id", ondelete="CASCADE"), nullable=False
     )
-    config_id = Column(
-        String, ForeignKey("manual_task_config.id", ondelete="CASCADE"), nullable=True
-    )
-    instance_id = Column(
-        String,
-        ForeignKey("manual_task_instance.id", ondelete="CASCADE"),
-        nullable=True,
-    )
+    config_id = Column(String, ForeignKey("manual_task_config.id"), nullable=True)
+    instance_id = Column(String, nullable=True)
     status = Column(String, nullable=False)
     message = Column(String, nullable=False)
     details = Column(JSONB, nullable=True)
 
-    # Relationships
-    task = relationship(
-        "ManualTask", back_populates="logs", foreign_keys=[task_id], viewonly=True
-    )
+    # Relationships - using string references to avoid circular imports
+    task = relationship("ManualTask", back_populates="logs", foreign_keys=[task_id])
     config = relationship(
-        "ManualTaskConfig",
-        back_populates="logs",
-        foreign_keys=[config_id],
-        viewonly=True,
+        "ManualTaskConfig", back_populates="logs", foreign_keys=[config_id]
     )
-    instance = relationship("ManualTaskInstance", back_populates="logs", viewonly=True)
+    # TODO: Add instance relationship when it is implemented
+    # instance = relationship("ManualTaskInstance", back_populates="logs")
 
     @classmethod
     def create_log(

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/api/schemas/manual_tasks/manual_task_schemas.py

@@ -5,15 +5,6 @@ from typing import Annotated, Any, Optional
 from pydantic import ConfigDict, Field
 
 from fides.api.schemas.base_class import FidesSchema
-from fides.api.schemas.manual_tasks.manual_task_status import StatusType
-
-
-class ManualTaskExecutionTiming(str, Enum):
-    """Enum for when a manual task should be executed in the privacy request DAG."""
-
-    pre_execution = "pre_execution"  # Execute before the main DAG
-    post_execution = "post_execution"  # Execute after the main DAG
-    parallel = "parallel"  # Execute in parallel with the main DAG
 
 
 class ManualTaskType(str, Enum):
@@ -32,13 +23,6 @@ class ManualTaskParentEntityType(str, Enum):
     # Add more parent entity types as needed
 
 
-class ManualTaskEntityType(str, Enum):
-    """Enum for manual task entity types."""
-
-    privacy_request = "privacy_request"
-    # Add more entity types as needed
-
-
 class ManualTaskReferenceType(str, Enum):
     """Enum for manual task reference types."""
 
@@ -62,32 +46,6 @@ class ManualTaskLogStatus(str, Enum):
     awaiting_input = "awaiting_input"
 
 
-class ManualTaskResponse(FidesSchema):
-    """Schema for manual task response."""
-
-    model_config = ConfigDict(extra="forbid")
-
-    id: Annotated[str, Field(..., description="Task ID")]
-    parent_entity_id: Annotated[str, Field(..., description="Parent entity ID")]
-    parent_entity_type: Annotated[
-        ManualTaskParentEntityType, Field(..., description="Parent entity type")
-    ]
-    status: Annotated[StatusType, Field(..., description="Task status")]
-    created_at: Annotated[datetime, Field(..., description="Creation timestamp")]
-    updated_at: Annotated[datetime, Field(..., description="Last update timestamp")]
-
-
-class ManualTaskCreate(FidesSchema):
-    """Schema for creating a manual task."""
-
-    model_config = ConfigDict(extra="forbid")
-
-    parent_entity_id: Annotated[str, Field(..., description="Parent entity ID")]
-    parent_entity_type: Annotated[
-        ManualTaskParentEntityType, Field(..., description="Parent entity type")
-    ]
-
-
 class ManualTaskLogCreate(FidesSchema):
     """Schema for creating a manual task log entry."""
 

ethyca_fides-2.64.1rc0/src/fides/api/schemas/manual_tasks/manual_task_status.py

@@ -0,0 +1,151 @@
+from datetime import datetime, timezone
+from enum import Enum as EnumType
+from typing import Optional
+
+from sqlalchemy.orm import Session
+
+
+class StatusTransitionNotAllowed(Exception):
+    """Exception raised when a status transition is not allowed."""
+
+    def __init__(self, message: str):
+        self.message = message
+        super().__init__(self.message)
+
+
+class StatusType(str, EnumType):
+    """Enum for manual task status."""
+
+    pending = "pending"
+    in_progress = "in_progress"
+    completed = "completed"
+    failed = "failed"
+
+    @classmethod
+    def get_valid_transitions(cls, current_status: "StatusType") -> list["StatusType"]:
+        """Get valid transitions from the current status.
+
+        Args:
+            current_status: The current status
+
+        Returns:
+            list[StatusType]: List of valid transitions
+        """
+        if current_status == cls.pending:
+            return [cls.in_progress, cls.failed, cls.completed]
+        if current_status == cls.in_progress:
+            return [cls.completed, cls.failed]
+        if current_status == cls.completed:
+            return []
+        if current_status == cls.failed:
+            return [cls.pending, cls.in_progress]
+        return []
+
+
+class StatusTransitionMixin:
+    """Mixin for handling status transitions.
+
+    This mixin provides methods for managing status transitions and completion tracking.
+    It can be used by any model that needs status management.
+    """
+
+    # These should be overridden by the implementing class
+    status: StatusType
+    completed_at: Optional[datetime]
+    completed_by_id: Optional[str]
+
+    def _get_valid_transitions(self) -> list[StatusType]:
+        """Get valid transitions from the current status.
+
+        Returns:
+            list[StatusType]: List of valid transitions
+        """
+        return StatusType.get_valid_transitions(self.status)
+
+    def _validate_status_transition(self, new_status: StatusType) -> None:
+        """Validate that a status transition is allowed.
+
+        Args:
+            new_status: The new status to transition to
+
+        Raises:
+            StatusTransitionNotAllowed: If the transition is not allowed
+        """
+        # Don't allow transitions to the same status
+        if new_status == self.status:
+            raise StatusTransitionNotAllowed(
+                f"Invalid status transition: already in status {new_status}"
+            )
+
+        # Get valid transitions for current status
+        valid_transitions = self._get_valid_transitions()
+        if new_status not in valid_transitions:
+            raise StatusTransitionNotAllowed(
+                f"Invalid status transition from {self.status} to {new_status}. "
+                f"Valid transitions are: {valid_transitions}"
+            )
+
+    def update_status(
+        self, db: Session, new_status: StatusType, user_id: Optional[str] = None
+    ) -> None:
+        """Update the status with validation and completion handling.
+
+        Args:
+            db: Database session
+            new_status: New status to set
+            user_id: Optional user ID who is making the change
+        """
+        self._validate_status_transition(new_status)
+
+        if new_status == StatusType.completed:
+            self.completed_at = datetime.now(timezone.utc)
+            self.completed_by_id = user_id
+        elif new_status == StatusType.pending:
+            # Reset completion fields if going back to pending
+            self.completed_at = None
+            self.completed_by_id = None
+
+        self.status = new_status
+        db.add(self)
+        db.commit()
+
+    def mark_completed(self, db: Session, user_id: str) -> None:
+        """Mark as completed.
+
+        Args:
+            db: Database session
+            user_id: user ID who completed the task
+        """
+        self.update_status(db, StatusType.completed, user_id)
+
+    def mark_failed(self, db: Session) -> None:
+        """Mark as failed."""
+        self.update_status(db, StatusType.failed)
+
+    def start_progress(self, db: Session) -> None:
+        """Mark as in progress."""
+        self.update_status(db, StatusType.in_progress)
+
+    def reset_to_pending(self, db: Session) -> None:
+        """Reset to pending status."""
+        self.update_status(db, StatusType.pending)
+
+    @property
+    def is_completed(self) -> bool:
+        """Check if completed."""
+        return self.status == StatusType.completed
+
+    @property
+    def is_failed(self) -> bool:
+        """Check if failed."""
+        return self.status == StatusType.failed
+
+    @property
+    def is_in_progress(self) -> bool:
+        """Check if in progress."""
+        return self.status == StatusType.in_progress
+
+    @property
+    def is_pending(self) -> bool:
+        """Check if pending."""
+        return self.status == StatusType.pending

{ethyca_fides-2.64.1b1 → ethyca_fides-2.64.1rc0}/src/fides/service/manual_tasks/manual_task_config_service.py

@@ -15,14 +15,6 @@ from fides.api.schemas.manual_tasks.manual_task_config import (
 from fides.service.manual_tasks.utils import validate_fields, with_task_logging
 
 
-class ManualTaskConfigError(Exception):
-    """Exception raised when a manual task config error occurs."""
-
-    def __init__(self, message: str):
-        self.message = message
-        super().__init__(self.message)
-
-
 class ManualTaskConfigService:
     def __init__(self, db: Session):
         self.db = db
@@ -59,8 +51,8 @@ class ManualTaskConfigService:
         """
         try:
             ManualTaskConfigurationType(config_type)
-        except ManualTaskConfigError:
-            raise ManualTaskConfigError(f"Invalid config type: {config_type}")
+        except ValueError:
+            raise ValueError(f"Invalid config type: {config_type}")
 
         # Set all existing versions to non-current
         if is_current:
@@ -104,11 +96,7 @@ class ManualTaskConfigService:
         modified_keys = set(fields_to_remove or [])
 
         if field_updates:
-            try:
-                validate_fields(field_updates, is_submission=False)
-            except ValueError as e:
-                raise ManualTaskConfigError(f"Invalid field updates: {e}") from e
-
+            validate_fields(field_updates, is_submission=False)
             fields_to_create = [
                 {
                     "task_id": config.task_id,
@@ -179,7 +167,7 @@ class ManualTaskConfigService:
         )
 
         if not config:
-            raise ManualTaskConfigError(
+            raise ValueError(
                 f"No current config found for task {task.id} and type {config_type}"
             )
         return config
@@ -367,7 +355,7 @@ class ManualTaskConfigService:
         """
         config = self.db.query(ManualTaskConfig).filter_by(id=config_id).first()
         if not config:
-            raise ManualTaskConfigError(f"Config with ID {config_id} not found")
+            raise ValueError(f"Config with ID {config_id} not found")
 
         log_data = self._create_log_data(
             task.id,