Skip to content

Commit c34bd7f

Browse files
committed
refactor: split up of schemas in separate files
1 parent 820eb04 commit c34bd7f

File tree

19 files changed

+120
-121
lines changed

19 files changed

+120
-121
lines changed

app/database/models/processing_job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from app.database.db import Base
66
from sqlalchemy.orm import Session, Mapped, mapped_column
77

8-
from app.schemas import ProcessTypeEnum, ProcessingStatusEnum
8+
from app.schemas.unit_job import ProcessTypeEnum, ProcessingStatusEnum
99

1010

1111
logger = logging.getLogger(__name__)

app/platforms/base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from abc import ABC, abstractmethod
22

3-
from app.schemas import ProcessingStatusEnum, ServiceDetails
3+
from app.schemas.enum import ProcessingStatusEnum
4+
from app.schemas.unit_job import ServiceDetails
45

56

67
class BaseProcessingPlatform(ABC):

app/platforms/dispatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pkgutil
55
from typing import Dict, Type
66
from app.platforms.base import BaseProcessingPlatform
7-
from app.schemas import ProcessTypeEnum
7+
from app.schemas.enum import ProcessTypeEnum
88

99
PROCESSING_PLATFORMS: Dict[ProcessTypeEnum, Type[BaseProcessingPlatform]] = {}
1010

app/platforms/implementations/ogc_api_process.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from app.platforms.base import BaseProcessingPlatform
44
from app.platforms.dispatcher import register_processing_platform
5-
from app.schemas import ProcessTypeEnum, ProcessingStatusEnum, ServiceDetails
5+
from app.schemas.enum import ProcessTypeEnum, ProcessingStatusEnum
6+
from app.schemas.unit_job import ServiceDetails
67

78
logger = logging.getLogger(__name__)
89

app/platforms/implementations/openeo.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99

1010
from app.platforms.base import BaseProcessingPlatform
1111
from app.platforms.dispatcher import register_processing_platform
12-
from app.schemas import (
13-
ProcessTypeEnum,
14-
ProcessingStatusEnum,
15-
ServiceDetails,
16-
)
12+
from app.schemas.enum import ProcessTypeEnum, ProcessingStatusEnum
13+
from app.schemas.unit_job import ServiceDetails
1714

1815
load_dotenv()
1916
logger = logging.getLogger(__name__)

app/routers/jobs_status.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from sqlalchemy.orm import Session
66

77
from app.database.db import get_db
8-
from app.schemas import JobsStatusResponse
8+
from app.schemas.jobs_status import JobsStatusResponse
99
from app.services.processing import get_processing_jobs_by_user_id
1010

1111
router = APIRouter()

app/routers/unit_jobs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from sqlalchemy.orm import Session
55

66
from app.database.db import get_db
7-
from app.schemas import BaseJobRequest, ProcessingJobSummary, ProcessingJob
7+
from app.schemas.unit_job import BaseJobRequest, ProcessingJob, ProcessingJobSummary
88
from app.services.processing import create_processing_job, get_processing_job_by_user_id
99

1010
# from app.auth import get_current_user

app/schemas.py

Lines changed: 0 additions & 95 deletions
This file was deleted.

app/schemas/enum.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
from enum import Enum
2+
3+
4+
class ProcessTypeEnum(str, Enum):
5+
OPENEO = "openeo"
6+
OGC_API_PROCESS = "ogc_api_process"
7+
8+
9+
class ProcessingStatusEnum(str, Enum):
10+
CREATED = "created"
11+
QUEUED = "queued"
12+
RUNNING = "running"
13+
FINISHED = "finished"
14+
CANCELED = "canceled"
15+
FAILED = "failed"
16+
UNKNOWN = "unknown"

app/schemas/jobs_status.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
from typing import List
2+
from pydantic import BaseModel
3+
4+
from app.schemas.unit_job import ProcessingJobSummary
5+
from app.schemas.upscaling_task import UpscalingTaskSummary
6+
7+
8+
class JobsStatusResponse(BaseModel):
9+
upscaling_tasks: List[UpscalingTaskSummary] = []
10+
processing_jobs: List[ProcessingJobSummary] = []

0 commit comments

Comments
 (0)