diff --git a/boefjes/boefjes/app.py b/boefjes/boefjes/app.py index b58b1b2f542..86685453362 100644 --- a/boefjes/boefjes/app.py +++ b/boefjes/boefjes/app.py @@ -282,7 +282,7 @@ def get_runtime_manager(settings: Settings, queue: str, log_level: str) -> Worke return SchedulerWorkerManager( item_handler, - SchedulerAPIClient(base_url=str(settings.scheduler_api)), # Do not share a session between workers + SchedulerAPIClient(str(settings.scheduler_api)), # Do not share a session between workers settings, log_level, ) diff --git a/boefjes/boefjes/config.py b/boefjes/boefjes/config.py index 7541d6c8623..8299dad166f 100644 --- a/boefjes/boefjes/config.py +++ b/boefjes/boefjes/config.py @@ -8,7 +8,6 @@ from pydantic_settings.sources import EnvSettingsSource from boefjes.models import EncryptionMiddleware -from boefjes.runtime_interfaces import WorkerManager BASE_DIR: Path = Path(__file__).parent.resolve() @@ -133,7 +132,7 @@ class Settings(BaseSettings): examples=[[], ["ipv4", "wifi-pineapple"]], ) - runner_type: WorkerManager.Queue | None = Field(None, examples=["boefje", "normalizer"]) + runner_type: Literal["boefje", "normalizer"] = Field(None, examples=["boefje", "normalizer"]) logging_format: Literal["text", "json"] = Field("text", description="Logging format") diff --git a/boefjes/boefjes/runtime_interfaces.py b/boefjes/boefjes/runtime_interfaces.py index 0a9b1e44cc1..dab3c8bfdfc 100644 --- a/boefjes/boefjes/runtime_interfaces.py +++ b/boefjes/boefjes/runtime_interfaces.py @@ -1,5 +1,3 @@ -from typing import Literal - from boefjes.job_models import BoefjeMeta, NormalizerMeta, NormalizerResults @@ -19,8 +17,6 @@ def run(self, normalizer_meta: NormalizerMeta, raw: bytes) -> NormalizerResults: class WorkerManager: - Queue = Literal["boefje", "normalizer"] - def run(self, queue: str) -> None: raise NotImplementedError()