(release) Update to 3.5.0rc1

.github/workflows/pypi-release.yml

@@ -15,37 +15,19 @@ jobs:
       TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
       TWINE_NON_INTERACTIVE: 1
     steps:
-      - name: Checkout sources
+      - name: checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - name: Setup Node 20
+      - name: install deps
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8
-
-      - name: Install pnpm dependencies
-        working-directory: invokeai/frontend/web
-        run: 'pnpm install --prefer-frozen-lockfile'
-
-      - name: Build frontend
-        working-directory: invokeai/frontend/web
-        run: 'pnpm build'
-
-      - name: Install python deps
         run: pip install --upgrade build twine
 
-      - name: Build wheel package
+      - name: build package
         run: python3 -m build
 
-      - name: Check distribution
+      - name: check distribution
         run: twine check dist/*
 
-      - name: Check PyPI versions
+      - name: check PyPI versions
         if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
         run: |
           pip install --upgrade requests
@@ -54,6 +36,6 @@ jobs:
           EXISTS=scripts.pypi_helper.local_on_pypi(); \
           print(f'PACKAGE_EXISTS={EXISTS}')" >> $GITHUB_ENV
 
-      - name: Upload package
+      - name: upload package
         if: env.PACKAGE_EXISTS == 'False' && env.TWINE_PASSWORD != ''
         run: twine upload dist/*

invokeai/app/api/routers/model_records.py

@@ -45,9 +45,6 @@ async def list_model_records(
     base_models: Optional[List[BaseModelType]] = Query(default=None, description="Base models to include"),
     model_type: Optional[ModelType] = Query(default=None, description="The type of model to get"),
     model_name: Optional[str] = Query(default=None, description="Exact match on the name of the model"),
-    model_format: Optional[str] = Query(
-        default=None, description="Exact match on the format of the model (e.g. 'diffusers')"
-    ),
 ) -> ModelsList:
     """Get a list of models."""
     record_store = ApiDependencies.invoker.services.model_records
@@ -55,14 +52,10 @@ async def list_model_records(
     if base_models:
         for base_model in base_models:
             found_models.extend(
-                record_store.search_by_attr(
+                record_store.search_by_attr(base_model=base_model, model_type=model_type, model_name=model_name)
-                    base_model=base_model, model_type=model_type, model_name=model_name, model_format=model_format
-                )
             )
     else:
-        found_models.extend(
+        found_models.extend(record_store.search_by_attr(model_type=model_type, model_name=model_name))
-            record_store.search_by_attr(model_type=model_type, model_name=model_name, model_format=model_format)
-        )
     return ModelsList(models=found_models)
 
 

invokeai/app/services/model_records/model_records_base.py

@@ -7,7 +7,7 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 from typing import List, Optional, Union
 
-from invokeai.backend.model_manager.config import AnyModelConfig, BaseModelType, ModelFormat, ModelType
+from invokeai.backend.model_manager.config import AnyModelConfig, BaseModelType, ModelType
 
 
 class DuplicateModelException(Exception):
@@ -106,7 +106,6 @@ class ModelRecordServiceBase(ABC):
         model_name: Optional[str] = None,
         base_model: Optional[BaseModelType] = None,
         model_type: Optional[ModelType] = None,
-        model_format: Optional[ModelFormat] = None,
     ) -> List[AnyModelConfig]:
         """
         Return models matching name, base and/or type.
@@ -114,7 +113,6 @@ class ModelRecordServiceBase(ABC):
         :param model_name: Filter by name of model (optional)
         :param base_model: Filter by base model (optional)
         :param model_type: Filter by type of model (optional)
-        :param model_format: Filter by model format (e.g. "diffusers") (optional)
 
         If none of the optional filters are passed, will return all
         models in the database.

invokeai/app/services/model_records/model_records_sql.py

@@ -49,7 +49,6 @@ from invokeai.backend.model_manager.config import (
     AnyModelConfig,
     BaseModelType,
     ModelConfigFactory,
-    ModelFormat,
     ModelType,
 )
 
@@ -226,7 +225,6 @@ class ModelRecordServiceSQL(ModelRecordServiceBase):
         model_name: Optional[str] = None,
         base_model: Optional[BaseModelType] = None,
         model_type: Optional[ModelType] = None,
-        model_format: Optional[ModelFormat] = None,
     ) -> List[AnyModelConfig]:
         """
         Return models matching name, base and/or type.
@@ -234,7 +232,6 @@ class ModelRecordServiceSQL(ModelRecordServiceBase):
         :param model_name: Filter by name of model (optional)
         :param base_model: Filter by base model (optional)
         :param model_type: Filter by type of model (optional)
-        :param model_format: Filter by model format (e.g. "diffusers") (optional)
 
         If none of the optional filters are passed, will return all
         models in the database.
@@ -251,9 +248,6 @@ class ModelRecordServiceSQL(ModelRecordServiceBase):
         if model_type:
             where_clause.append("type=?")
             bindings.append(model_type)
-        if model_format:
-            where_clause.append("format=?")
-            bindings.append(model_format)
         where = f"WHERE {' AND '.join(where_clause)}" if where_clause else ""
         with self._db.lock:
             self._cursor.execute(

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "3.4.0post2"
+__version__ = "3.5.0rc1"