immich: some improvements (#344237)

Author: dotlambda

nixos/modules/services/web-apps/immich.nix

@@ -290,7 +290,7 @@ in
       wantedBy = [ "multi-user.target" ];
       inherit (cfg.machine-learning) environment;
       serviceConfig = commonServiceConfig // {
-        ExecStart = lib.getExe cfg.package.machine-learning;
+        ExecStart = lib.getExe (cfg.package.machine-learning.override { immich = cfg.package; });
         CacheDirectory = "immich";
         User = cfg.user;
         Group = cfg.group;

pkgs/by-name/im/immich/machine-learning.nix renamed to pkgs/by-name/im/immich-machine-learning/package.nix

@@ -1,46 +1,43 @@
 {
   lib,
-  src,
   fetchFromGitHub,
   immich,
   python3,
-  # Override Python packages using
-  # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
-  # Applied after defaultOverrides
-  packageOverrides ? self: super: { },
 }:
 let
-  defaultOverrides = self: super: {
-    pydantic = super.pydantic_1;
+  python = python3.override {
+    self = python;
 
-    versioningit = super.versioningit.overridePythonAttrs (_: {
-      doCheck = false;
-    });
+    packageOverrides = self: super: {
+      pydantic = super.pydantic_1;
 
-    albumentations = super.albumentations.overridePythonAttrs (_: rec {
-      version = "1.4.3";
-      src = fetchFromGitHub {
-        owner = "albumentations-team";
-        repo = "albumentations";
-        rev = version;
-        hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA=";
-      };
-    });
-  };
+      versioningit = super.versioningit.overridePythonAttrs (_: {
+        doCheck = false;
+      });
 
-  python = python3.override {
-    self = python;
-    packageOverrides = lib.composeExtensions defaultOverrides packageOverrides;
+      albumentations = super.albumentations.overridePythonAttrs (_: rec {
+        version = "1.4.3";
+        src = fetchFromGitHub {
+          owner = "albumentations-team";
+          repo = "albumentations";
+          rev = version;
+          hash = "sha256-JIBwjYaUP4Sc1bVM/zlj45cz9OWpb/LOBsIqk1m+sQA=";
+        };
+      });
+    };
   };
 in
 python.pkgs.buildPythonApplication {
   pname = "immich-machine-learning";
   inherit (immich) version;
-  src = "${src}/machine-learning";
+  src = "${immich.src}/machine-learning";
   pyproject = true;
 
   postPatch = ''
     substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi'
+
+    # AttributeError: module 'cv2' has no attribute 'Mat'
+    substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" ""
   '';
 
   pythonRelaxDeps = [ "setuptools" ];
@@ -72,7 +69,12 @@ python.pkgs.buildPythonApplication {
     ]
     ++ uvicorn.optional-dependencies.standard;
 
-  doCheck = false;
+  nativeCheckInputs = with python.pkgs; [
+    httpx
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
 
   postInstall = ''
     mkdir -p $out/share/immich

pkgs/by-name/im/immich/package.nix

@@ -8,7 +8,7 @@
   node-gyp,
   runCommand,
   nixosTests,
-  callPackage,
+  immich-machine-learning,
   # build-time deps
   glib,
   pkg-config,
@@ -210,7 +210,7 @@ buildNpmPackage' {
       inherit (nixosTests) immich;
     };
 
-    machine-learning = callPackage ./machine-learning.nix { inherit src; };
+    machine-learning = immich-machine-learning;
 
     inherit
       src

pkgs/by-name/im/immich/update.sh

@@ -41,4 +41,4 @@ for npm_component in cli server web "open-api/typescript-sdk"; do
 done
 
 rm "$lock"
-cp "$sources_tmp" sources.json
+mv "$sources_tmp" sources.json