Skip to content

High performance self-hosted photo and video management solution.

chore(ml)!: remove deprecated envs (#28326)

Mert8c8dc9d32fb3
diff --git a/machine-learning/immich_ml/config.py b/machine-learning/immich_ml/config.py
index 8b383f5419..c5ba0bdf0a 100644
--- a/machine-learning/immich_ml/config.py
+++ b/machine-learning/immich_ml/config.py
@@ -32,25 +32,12 @@ class OcrSettings(BaseModel):
class PreloadModelData(BaseModel):
- clip_fallback: str | None = os.getenv("MACHINE_LEARNING_PRELOAD__CLIP", None)
- facial_recognition_fallback: str | None = os.getenv("MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION", None)
- if clip_fallback is not None:
- os.environ["MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL"] = clip_fallback
- os.environ["MACHINE_LEARNING_PRELOAD__CLIP__VISUAL"] = clip_fallback
- del os.environ["MACHINE_LEARNING_PRELOAD__CLIP"]
- if facial_recognition_fallback is not None:
- os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION"] = facial_recognition_fallback
- os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION"] = facial_recognition_fallback
- del os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION"]
clip: ClipSettings = ClipSettings()
facial_recognition: FacialRecognitionSettings = FacialRecognitionSettings()
ocr: OcrSettings = OcrSettings()
class MaxBatchSize(BaseModel):
- ocr_fallback: str | None = os.getenv("MACHINE_LEARNING_MAX_BATCH_SIZE__TEXT_RECOGNITION", None)
- if ocr_fallback is not None:
- os.environ["MACHINE_LEARNING_MAX_BATCH_SIZE__OCR"] = ocr_fallback
facial_recognition: int | None = None
ocr: int | None = None
diff --git a/machine-learning/immich_ml/main.py b/machine-learning/immich_ml/main.py
index 4fca7a2e2b..54f9a53930 100644
--- a/machine-learning/immich_ml/main.py
+++ b/machine-learning/immich_ml/main.py
@@ -117,20 +117,6 @@ async def preload_models(preload: PreloadModelData) -> None:
ModelTask.OCR,
)
- if preload.clip_fallback is not None:
- log.warning(
- "Deprecated env variable: 'MACHINE_LEARNING_PRELOAD__CLIP'. "
- "Use 'MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL' and "
- "'MACHINE_LEARNING_PRELOAD__CLIP__VISUAL' instead."
- )
-
- if preload.facial_recognition_fallback is not None:
- log.warning(
- "Deprecated env variable: 'MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION'. "
- "Use 'MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION' and "
- "'MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION' instead."
- )
-
def update_state() -> Iterator[None]:
global active_requests, last_called