chore: Bump version to 0.12.6, update BlendJob wheel to 0.1.8, and revise documentation for model catalog and server integration

tests/test_models.py

@@ -23,6 +23,20 @@ class ModelTest(unittest.TestCase):
             "snapform_models",
             "src/snapform/model_catalog.py",
         )
+        cls.server_models = load_module(
+            "snapform_server_models",
+            "src/snapform/server/model_catalog.py",
+        )
+
+    def test_client_and_server_catalogs_share_storage_contract(self):
+        client = self.models.DOWNLOADABLE_MODELS
+        server = self.server_models.DOWNLOADABLE_MODELS
+
+        self.assertEqual(set(client), set(server))
+        for key in client:
+            with self.subTest(key=key):
+                self.assertEqual(client[key].directory_name, server[key].directory_name)
+                self.assertEqual(client[key].ready_patterns, server[key].ready_patterns)
 
     def test_base_model_is_default_friendly_apache_model(self):
         model = self.models.get_model("BASE")

tests/test_pack.py

@@ -73,7 +73,7 @@ class PackTest(unittest.TestCase):
                 self.assertNotIn("server/jobs.py", names)
                 self.assertIn("server/__init__.py", names)
                 self.assertIn(
-                    "wheels/blendjob-0.1.6-py3-none-any.whl",
+                    "wheels/blendjob-0.1.8-py3-none-any.whl",
                     names,
                 )
                 self.assertFalse(

tests/test_server.py

@@ -1,4 +1,4 @@
-import importlib
+import importlib.util
 import sys
 import tempfile
 import threading
@@ -13,12 +13,15 @@ PROJECT_ROOT = Path(__file__).resolve().parents[1]
 
 
 def load_server_module():
-    addon_directory = PROJECT_ROOT / "src" / "snapform"
-    sys.path.insert(0, str(addon_directory))
-    try:
-        return importlib.import_module("server")
-    finally:
-        sys.path.remove(str(addon_directory))
+    server_directory = PROJECT_ROOT / "src" / "snapform" / "server"
+    specification = importlib.util.spec_from_file_location(
+        "server", server_directory / "__init__.py",
+        submodule_search_locations=[str(server_directory)],
+    )
+    module = importlib.util.module_from_spec(specification)
+    sys.modules["server"] = module
+    specification.loader.exec_module(module)
+    return module
 
 
 class FakeCuda:
@@ -70,8 +73,12 @@ class ServerTest(unittest.TestCase):
         with tempfile.TemporaryDirectory() as directory:
             manager = self.server_module.ModelManager(Path(directory))
             snapshot = manager.snapshot()
-        self.assertIn("catalog", snapshot)
-        self.assertTrue(snapshot["catalog"])
+        self.assertEqual(
+            snapshot,
+            {"loaded": {"ben2": "", "da3": "", "moge2": ""}},
+        )
+        self.assertIn("server.model_catalog", sys.modules)
+        self.assertNotIn("model_catalog", sys.modules)
 
     def create_cache(self):
         cache = self.server_module.ModelSessionCache.__new__(