Merge pull request #148 from Haidra-Org/main

fix: allow floats for model requirement values
Haidra-Org · Sep 30, 2024 · d1a64a9 · d1a64a9
2 parents de4ce62 + 825cf0e
commit d1a64a9
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 34 deletions.
diff --git a/.github/workflows/maintests.yml b/.github/workflows/maintests.yml
@@ -11,20 +11,10 @@ on:
       - '.github/workflows/maintests.yml'
       - '.github/workflows/prtests.yml'
       - '.github/workflows/release.yml'
-      - '.pre-commit-config.yaml'
       - 'requirements.txt'
       - 'requirements.dev.txt'
       - 'requirements.docs.txt'
 jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run pre-commit
-        uses: pre-commit/action@v3.0.0
-        with:
-          extra_args: --all-files
-
   no_extra_fields:
     env:
       AIWORKER_CACHE_HOME: ${{ github.workspace }}/.cache

diff --git a/.github/workflows/prtests.yml b/.github/workflows/prtests.yml
@@ -14,22 +14,10 @@ on:
       - '.github/workflows/maintests.yml'
       - '.github/workflows/prtests.yml'
       - '.github/workflows/release.yml'
-      - '.pre-commit-config.yaml'
       - 'requirements.txt'
       - 'requirements.dev.txt'
       - 'requirements.docs.txt'
 jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Run pre-commit
-        uses: pre-commit/action@v3.0.0
-        with:
-          extra_args: --all-files
-
   no_extra_fields:
     env:
       AIWORKER_CACHE_HOME: ${{ github.workspace }}/.cache

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,15 +6,26 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
     -   id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.6.8
     hooks:
     -    id: ruff
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.10.0'
+    rev: 'v1.11.2'
     hooks:
     -   id: mypy
         additional_dependencies: [pydantic, types-requests, types-pytz, types-setuptools, types-urllib3, StrEnum]
+ci:
+    autofix_commit_msg: |
+        [pre-commit.ci] auto fixes from pre-commit.com hooks
+
+        for more information, see https://pre-commit.ci
+    autofix_prs: true
+    autoupdate_branch: ''
+    autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
+    autoupdate_schedule: weekly
+    skip: []
+    submodules: false
diff --git a/horde_model_reference/legacy/classes/raw_legacy_model_database_records.py b/horde_model_reference/legacy/classes/raw_legacy_model_database_records.py
@@ -59,7 +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
+    requirements: dict[str, int | float | str | list[int] | list[float] | 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

diff --git a/horde_model_reference/legacy/classes/staging_model_database_records.py b/horde_model_reference/legacy/classes/staging_model_database_records.py
@@ -96,7 +96,7 @@ class Legacy_StableDiffusion_ModelRecord(StagingLegacy_Generic_ModelRecord):
     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
+    requirements: dict[str, int | float | str | list[int] | list[float] | list[str] | bool] | None = None
 
 
 class Legacy_Generic_ModelReference(BaseModel):

diff --git a/horde_model_reference/model_reference_records.py b/horde_model_reference/model_reference_records.py
@@ -90,7 +90,7 @@ 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
+    requirements: dict[str, int | float | str | list[int] | list[float] | list[str] | bool] | None = None
 
     size_on_disk_bytes: int | None = None
 

diff --git a/legacy_stable_diffusion.schema.json b/legacy_stable_diffusion.schema.json
@@ -242,6 +242,9 @@
                                     {
                                         "type": "integer"
                                     },
+                                    {
+                                        "type": "number"
+                                    },
                                     {
                                         "type": "string"
                                     },
@@ -251,6 +254,12 @@
                                         },
                                         "type": "array"
                                     },
+                                    {
+                                        "items": {
+                                            "type": "number"
+                                        },
+                                        "type": "array"
+                                    },
                                     {
                                         "items": {
                                             "type": "string"

diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -1,9 +1,9 @@
-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
+pytest==8.3.3
+mypy==1.11.2
+black==24.8.0
+ruff==0.6.8
+tox~=4.20.0
+pre-commit~=3.8.0
 build>=0.10.0
 coverage>=7.2.7
 

diff --git a/stable_diffusion.schema.json b/stable_diffusion.schema.json
@@ -284,6 +284,9 @@
                                     {
                                         "type": "integer"
                                     },
+                                    {
+                                        "type": "number"
+                                    },
                                     {
                                         "type": "string"
                                     },
@@ -293,6 +296,12 @@
                                         },
                                         "type": "array"
                                     },
+                                    {
+                                        "items": {
+                                            "type": "number"
+                                        },
+                                        "type": "array"
+                                    },
                                     {
                                         "items": {
                                             "type": "string"