horde-model-reference 0.6.2__tar.gz → 0.7.0__tar.gz

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/.github/workflows/maintests.yml

@@ -22,6 +22,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.0
+        with:
+          extra_args: --all-files
 
   no_extra_fields:
     env:

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/.github/workflows/prtests.yml

@@ -25,6 +25,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.0
+        with:
+          extra_args: --all-files
 
   no_extra_fields:
     env:

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 24.2.0
+    rev: 24.4.2
     hooks:
     -   id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.2
+    rev: v0.4.7
     hooks:
     -    id: ruff
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.8.0'
+    rev: 'v1.10.0'
     hooks:
     -   id: mypy
         additional_dependencies: [pydantic, types-requests, types-pytz, types-setuptools, types-urllib3, StrEnum]

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horde_model_reference
-Version: 0.6.2
+Version: 0.7.0
 Summary: A helper library providing a way to work with the lists of diffusion models, utility models, and any other related files required for AI-Horde.
 Author-email: tazlin <tazlin.on.github@gmail.com>, db0 <mail@dbzer0.com>, Jug <jugdev@proton.me>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = 'v0.6.2'
-__version_tuple__ = version_tuple = (0, 6, 2)
+__version__ = version = 'v0.7.0'
+__version_tuple__ = version_tuple = (0, 7, 0)

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference/legacy/classes/raw_legacy_model_database_records.py

@@ -46,6 +46,7 @@ class RawLegacy_StableDiffusion_ModelRecord(BaseModel):
 
     name: str
     baseline: str
+    optimization: str | None = None
     type: str
     inpainting: bool
     description: str | None = None
@@ -58,6 +59,7 @@ class RawLegacy_StableDiffusion_ModelRecord(BaseModel):
     homepage: str | None = None
     nsfw: bool
     download_all: bool
+    requirements: dict[str, int | str | list[int] | list[str] | bool] | None = None
     config: Mapping[str, list[RawLegacy_FileRecord | RawLegacy_DownloadRecord]]
     available: bool | None = None
     features_not_supported: list[FEATURE_SUPPORTED] | None = None

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference/legacy/classes/staging_model_database_records.py

@@ -95,6 +95,8 @@ class Legacy_StableDiffusion_ModelRecord(StagingLegacy_Generic_ModelRecord):
     trigger: list[str] | None = None
     homepage: str | None = None
     size_on_disk_bytes: int | None = None
+    optimization: str | None = None
+    requirements: dict[str, int | str | list[int] | list[str] | bool] | None = None
 
 
 class Legacy_Generic_ModelReference(BaseModel):
@@ -124,4 +126,5 @@ MODEL_REFERENCE_LEGACY_TYPE_LOOKUP: dict[MODEL_REFERENCE_CATEGORY, type[StagingL
     MODEL_REFERENCE_CATEGORY.gfpgan: StagingLegacy_Generic_ModelRecord,
     MODEL_REFERENCE_CATEGORY.safety_checker: StagingLegacy_Generic_ModelRecord,
     MODEL_REFERENCE_CATEGORY.stable_diffusion: Legacy_StableDiffusion_ModelRecord,
+    MODEL_REFERENCE_CATEGORY.miscellaneous: StagingLegacy_Generic_ModelRecord,
 }

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference/meta_consts.py

@@ -60,6 +60,7 @@ class MODEL_REFERENCE_CATEGORY(StrEnum):
     gfpgan = auto()
     safety_checker = auto()
     stable_diffusion = auto()
+    miscellaneous = auto()
 
 
 class MODEL_PURPOSE(StrEnum):
@@ -78,6 +79,8 @@ class MODEL_PURPOSE(StrEnum):
     post_processor = auto()
     """The model is a post processor (after image generation) of some variety."""
 
+    miscellaneous = auto()
+
 
 class STABLE_DIFFUSION_BASELINE_CATEGORY(StrEnum):
     """An enum of all the stable diffusion baselines."""
@@ -98,4 +101,5 @@ MODEL_PURPOSE_LOOKUP: dict[MODEL_REFERENCE_CATEGORY, MODEL_PURPOSE] = {
     MODEL_REFERENCE_CATEGORY.gfpgan: MODEL_PURPOSE.post_processor,
     MODEL_REFERENCE_CATEGORY.safety_checker: MODEL_PURPOSE.post_processor,
     MODEL_REFERENCE_CATEGORY.stable_diffusion: MODEL_PURPOSE.image_generation,
+    MODEL_REFERENCE_CATEGORY.miscellaneous: MODEL_PURPOSE.miscellaneous,
 }

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference/model_reference_records.py

@@ -72,6 +72,8 @@ class StableDiffusion_ModelRecord(Generic_ModelRecord):
     """If this is an inpainting model or not."""
     baseline: STABLE_DIFFUSION_BASELINE_CATEGORY | str
     """The model on which this model is based."""
+    optimization: str | None = None
+    """The optimization type of the model."""
     tags: list[str] | None = []
     """Any tags associated with the model which may be useful for searching."""
     showcases: list[str] | None = []
@@ -88,6 +90,8 @@ class StableDiffusion_ModelRecord(Generic_ModelRecord):
     style: MODEL_STYLE | str | None = None
     """The style of the model."""
 
+    requirements: dict[str, int | str | list[int] | list[str] | bool] | None = None
+
     size_on_disk_bytes: int | None = None
 
     @model_validator(mode="after")
@@ -248,6 +252,7 @@ MODEL_REFERENCE_RECORD_TYPE_LOOKUP: dict[MODEL_REFERENCE_CATEGORY, type[Generic_
     MODEL_REFERENCE_CATEGORY.gfpgan: Generic_ModelRecord,
     MODEL_REFERENCE_CATEGORY.safety_checker: Generic_ModelRecord,
     MODEL_REFERENCE_CATEGORY.codeformer: Generic_ModelRecord,
+    MODEL_REFERENCE_CATEGORY.miscellaneous: Generic_ModelRecord,
 }
 """A lookup for the model record type based on the model category. See also `MODEL_REFERENCE_TYPE_LOOKUP`."""
 
@@ -260,5 +265,6 @@ MODEL_REFERENCE_TYPE_LOOKUP: dict[MODEL_REFERENCE_CATEGORY, type[Generic_ModelRe
     MODEL_REFERENCE_CATEGORY.gfpgan: Generic_ModelReference,
     MODEL_REFERENCE_CATEGORY.safety_checker: Generic_ModelReference,
     MODEL_REFERENCE_CATEGORY.codeformer: Generic_ModelReference,
+    MODEL_REFERENCE_CATEGORY.miscellaneous: Generic_ModelReference,
 }
 """A lookup for the model reference type based on the model category. See also `MODEL_REFERENCE_RECORD_TYPE_LOOKUP`."""

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/horde_model_reference.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: horde_model_reference
-Version: 0.6.2
+Version: 0.7.0
 Summary: A helper library providing a way to work with the lists of diffusion models, utility models, and any other related files required for AI-Horde.
 Author-email: tazlin <tazlin.on.github@gmail.com>, db0 <mail@dbzer0.com>, Jug <jugdev@proton.me>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/legacy_stable_diffusion.schema.json

@@ -109,6 +109,18 @@
                     "title": "Baseline",
                     "type": "string"
                 },
+                "optimization": {
+                    "anyOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "default": null,
+                    "title": "Optimization"
+                },
                 "type": {
                     "title": "Type",
                     "type": "string"
@@ -222,6 +234,43 @@
                     "title": "Download All",
                     "type": "boolean"
                 },
+                "requirements": {
+                    "anyOf": [
+                        {
+                            "additionalProperties": {
+                                "anyOf": [
+                                    {
+                                        "type": "integer"
+                                    },
+                                    {
+                                        "type": "string"
+                                    },
+                                    {
+                                        "items": {
+                                            "type": "integer"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "boolean"
+                                    }
+                                ]
+                            },
+                            "type": "object"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "default": null,
+                    "title": "Requirements"
+                },
                 "config": {
                     "additionalProperties": {
                         "items": {

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/requirements.dev.txt

@@ -1,9 +1,9 @@
-pytest==8.0.1
-mypy==1.8.0
-black==24.2.0
-ruff==0.2.2
-tox~=4.13.0
-pre-commit~=3.6.2
+pytest==8.2.1
+mypy==1.10.0
+black==24.4.2
+ruff==0.4.7
+tox~=4.15.0
+pre-commit~=3.7.1
 build>=0.10.0
 coverage>=7.2.7
 

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/stable_diffusion.example.json

@@ -18,6 +18,7 @@
         "features_not_supported": null,
         "inpainting": false,
         "baseline": "stable_diffusion_1",
+        "optimization": null,
         "tags": [
             "anime",
             "faces"
@@ -33,6 +34,7 @@
         "homepage": "https://www.not.a.real_website.com",
         "nsfw": false,
         "style": "generalist",
+        "requirements": null,
         "size_on_disk_bytes": 123456789
     },
     "example model 2": {
@@ -54,6 +56,7 @@
         "features_not_supported": null,
         "inpainting": false,
         "baseline": "stable_diffusion_1",
+        "optimization": null,
         "tags": [
             "anime",
             "faces"
@@ -69,6 +72,7 @@
         "homepage": "https://www.another_fake_website.com",
         "nsfw": true,
         "style": "anime",
+        "requirements": null,
         "size_on_disk_bytes": 123456789
     }
 }

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/stable_diffusion.schema.json

@@ -54,7 +54,8 @@
                 "controlnet",
                 "clip",
                 "blip",
-                "post_processor"
+                "post_processor",
+                "miscellaneous"
             ],
             "title": "MODEL_PURPOSE",
             "type": "string"
@@ -174,6 +175,18 @@
                     ],
                     "title": "Baseline"
                 },
+                "optimization": {
+                    "anyOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "default": null,
+                    "title": "Optimization"
+                },
                 "tags": {
                     "anyOf": [
                         {
@@ -262,6 +275,43 @@
                     "default": null,
                     "title": "Style"
                 },
+                "requirements": {
+                    "anyOf": [
+                        {
+                            "additionalProperties": {
+                                "anyOf": [
+                                    {
+                                        "type": "integer"
+                                    },
+                                    {
+                                        "type": "string"
+                                    },
+                                    {
+                                        "items": {
+                                            "type": "integer"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "items": {
+                                            "type": "string"
+                                        },
+                                        "type": "array"
+                                    },
+                                    {
+                                        "type": "boolean"
+                                    }
+                                ]
+                            },
+                            "type": "object"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "default": null,
+                    "title": "Requirements"
+                },
                 "size_on_disk_bytes": {
                     "anyOf": [
                         {

{horde_model_reference-0.6.2 → horde_model_reference-0.7.0}/tests/test_scripts.py

@@ -10,7 +10,7 @@ from horde_model_reference.path_consts import get_model_reference_file_path
 def test_download_all_model_references(base_path_for_tests: Path):
     reference_download_manager = LegacyReferenceDownloadManager(base_path=base_path_for_tests)
     download_models = reference_download_manager.download_all_legacy_model_references(overwrite_existing=True)
-    assert len(download_models) == 8
+    assert len(download_models) == len(MODEL_REFERENCE_CATEGORY.__members__)
 
 
 def test_validate_stable_diffusion_model_reference(legacy_folder_for_tests: Path):