update opened_at to be nullable

invokeai/app/api/routers/workflows.py

@@ -105,6 +105,7 @@ async def list_workflows(
     categories: Optional[list[WorkflowCategory]] = Query(default=None, description="The categories of workflow to get"),
     tags: Optional[list[str]] = Query(default=None, description="The tags of workflow to get"),
     query: Optional[str] = Query(default=None, description="The text to query by (matches name and description)"),
+    has_been_opened: Optional[bool] = Query(default=None, description="Whether to include/exclude recent workflows"),
 ) -> PaginatedResults[WorkflowRecordListItemWithThumbnailDTO]:
     """Gets a page of workflows"""
     workflows_with_thumbnails: list[WorkflowRecordListItemWithThumbnailDTO] = []
@@ -116,6 +117,7 @@ async def list_workflows(
         query=query,
         categories=categories,
         tags=tags,
+        has_been_opened=has_been_opened,
     )
     for workflow in workflows.items:
         workflows_with_thumbnails.append(
@@ -225,10 +227,25 @@ async def get_workflow_thumbnail(
 async def get_counts_by_tag(
     tags: list[str] = Query(description="The tags to get counts for"),
     categories: Optional[list[WorkflowCategory]] = Query(default=None, description="The categories to include"),
+    has_been_opened: Optional[bool] = Query(default=None, description="Whether to include/exclude recent workflows"),
 ) -> dict[str, int]:
-    """Gets tag counts with a filter"""
+    """Counts workflows by tag"""
 
-    return ApiDependencies.invoker.services.workflow_records.counts_by_tag(tags=tags, categories=categories)
+    return ApiDependencies.invoker.services.workflow_records.counts_by_tag(
+        tags=tags, categories=categories, has_been_opened=has_been_opened
+    )
+
+
+@workflows_router.get("/counts_by_category", operation_id="counts_by_category")
+async def counts_by_category(
+    categories: list[WorkflowCategory] = Query(description="The categories to include"),
+    has_been_opened: Optional[bool] = Query(default=None, description="Whether to include/exclude recent workflows"),
+) -> dict[str, int]:
+    """Counts workflows by category"""
+
+    return ApiDependencies.invoker.services.workflow_records.counts_by_category(
+        categories=categories, has_been_opened=has_been_opened
+    )
 
 
 @workflows_router.put(

invokeai/app/services/shared/sqlite/sqlite_util.py

@@ -20,6 +20,7 @@
 from invokeai.app.services.shared.sqlite_migrator.migrations.migration_15 import build_migration_15
 from invokeai.app.services.shared.sqlite_migrator.migrations.migration_16 import build_migration_16
 from invokeai.app.services.shared.sqlite_migrator.migrations.migration_17 import build_migration_17
+from invokeai.app.services.shared.sqlite_migrator.migrations.migration_18 import build_migration_18
 from invokeai.app.services.shared.sqlite_migrator.sqlite_migrator_impl import SqliteMigrator
 
 
@@ -57,6 +58,7 @@ def init_db(config: InvokeAIAppConfig, logger: Logger, image_files: ImageFileSto
     migrator.register_migration(build_migration_15())
     migrator.register_migration(build_migration_16())
     migrator.register_migration(build_migration_17())
+    migrator.register_migration(build_migration_18())
     migrator.run_migrations()
 
     return db

invokeai/app/services/shared/sqlite_migrator/migrations/migration_18.py

@@ -0,0 +1,47 @@
+import sqlite3
+
+from invokeai.app.services.shared.sqlite_migrator.sqlite_migrator_common import Migration
+
+
+class Migration18Callback:
+    def __call__(self, cursor: sqlite3.Cursor) -> None:
+        self._make_workflow_opened_at_nullable(cursor)
+
+    def _make_workflow_opened_at_nullable(self, cursor: sqlite3.Cursor) -> None:
+        """
+        Make the `opened_at` column nullable in the `workflow_library` table. This is accomplished by:
+            - Dropping the existing `idx_workflow_library_opened_at` index (must be done before dropping the column)
+            - Dropping the existing `opened_at` column
+            - Adding a new nullable column `opened_at` (no data migration needed, all values will be NULL)
+            - Adding a new `idx_workflow_library_opened_at` index on the `opened_at` column
+        """
+        # For index renaming in SQLite, we need to drop and recreate
+        cursor.execute("DROP INDEX IF EXISTS idx_workflow_library_opened_at;")
+        # Rename existing column to deprecated
+        cursor.execute("ALTER TABLE workflow_library DROP COLUMN opened_at;")
+        # Add new nullable column - all values will be NULL - no migration of data needed
+        cursor.execute("ALTER TABLE workflow_library ADD COLUMN opened_at DATETIME;")
+        # Create new index on the new column
+        cursor.execute(
+            "CREATE INDEX idx_workflow_library_opened_at ON workflow_library(opened_at);",
+        )
+
+
+def build_migration_18() -> Migration:
+    """
+    Build the migration from database version 17 to 18.
+
+    This migration does the following:
+        - Make the `opened_at` column nullable in the `workflow_library` table. This is accomplished by:
+            - Dropping the existing `idx_workflow_library_opened_at` index (must be done before dropping the column)
+            - Dropping the existing `opened_at` column
+            - Adding a new nullable column `opened_at` (no data migration needed, all values will be NULL)
+            - Adding a new `idx_workflow_library_opened_at` index on the `opened_at` column
+    """
+    migration_18 = Migration(
+        from_version=17,
+        to_version=18,
+        callback=Migration18Callback(),
+    )
+
+    return migration_18

invokeai/app/services/workflow_records/workflow_records_base.py

@@ -46,15 +46,26 @@ def get_many(
         per_page: Optional[int],
         query: Optional[str],
         tags: Optional[list[str]],
+        has_been_opened: Optional[bool],
     ) -> PaginatedResults[WorkflowRecordListItemDTO]:
         """Gets many workflows."""
         pass
 
+    @abstractmethod
+    def counts_by_category(
+        self,
+        categories: list[WorkflowCategory],
+        has_been_opened: Optional[bool] = None,
+    ) -> dict[str, int]:
+        """Gets a dictionary of counts for each of the provided categories."""
+        pass
+
     @abstractmethod
     def counts_by_tag(
         self,
         tags: list[str],
         categories: Optional[list[WorkflowCategory]] = None,
+        has_been_opened: Optional[bool] = None,
     ) -> dict[str, int]:
         """Gets a dictionary of counts for each of the provided tags."""
         pass

invokeai/app/services/workflow_records/workflow_records_common.py

@@ -1,6 +1,6 @@
 import datetime
 from enum import Enum
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 import semver
 from pydantic import BaseModel, ConfigDict, Field, JsonValue, TypeAdapter, field_validator
@@ -98,7 +98,7 @@ class WorkflowRecordDTOBase(BaseModel):
     name: str = Field(description="The name of the workflow.")
     created_at: Union[datetime.datetime, str] = Field(description="The created timestamp of the workflow.")
     updated_at: Union[datetime.datetime, str] = Field(description="The updated timestamp of the workflow.")
-    opened_at: Union[datetime.datetime, str] = Field(description="The opened timestamp of the workflow.")
+    opened_at: Optional[Union[datetime.datetime, str]] = Field(description="The opened timestamp of the workflow.")
 
 
 class WorkflowRecordDTO(WorkflowRecordDTOBase):

invokeai/app/services/workflow_records/workflow_records_sqlite.py

@@ -118,6 +118,7 @@ def get_many(
         per_page: Optional[int] = None,
         query: Optional[str] = None,
         tags: Optional[list[str]] = None,
+        has_been_opened: Optional[bool] = None,
     ) -> PaginatedResults[WorkflowRecordListItemDTO]:
         # sanitize!
         assert order_by in WorkflowRecordOrderBy
@@ -175,6 +176,11 @@ def get_many(
             conditions.append(tags_condition)
             params.extend(tags_params)
 
+        if has_been_opened:
+            conditions.append("opened_at IS NOT NULL")
+        elif has_been_opened is False:
+            conditions.append("opened_at IS NULL")
+
         # Ignore whitespace in the query
         stripped_query = query.strip() if query else None
         if stripped_query:
@@ -234,6 +240,7 @@ def counts_by_tag(
         self,
         tags: list[str],
         categories: Optional[list[WorkflowCategory]] = None,
+        has_been_opened: Optional[bool] = None,
     ) -> dict[str, int]:
         if not tags:
             return {}
@@ -251,6 +258,11 @@ def counts_by_tag(
             base_conditions.append(f"category IN ({placeholders})")
             base_params.extend([category.value for category in categories])
 
+        if has_been_opened:
+            base_conditions.append("opened_at IS NOT NULL")
+        elif has_been_opened is False:
+            base_conditions.append("opened_at IS NULL")
+
         # For each tag to count, run a separate query
         for tag in tags:
             # Start with the base conditions
@@ -276,20 +288,14 @@ def counts_by_tag(
 
         return result
 
-    def get_tag_counts_with_filter(
+    def counts_by_category(
         self,
-        tags_to_count: list[str],
-        selected_tags: Optional[list[str]] = None,
-        categories: Optional[list[WorkflowCategory]] = None,
+        categories: list[WorkflowCategory],
+        has_been_opened: Optional[bool] = None,
     ) -> dict[str, int]:
-        if not tags_to_count:
-            return {}
-
         cursor = self._conn.cursor()
         result: dict[str, int] = {}
-        selected_tags = selected_tags or []
-
-        # Base conditions for categories and selected tags
+        # Base conditions for categories
         base_conditions: list[str] = []
         base_params: list[str | int] = []
 
@@ -300,20 +306,20 @@ def get_tag_counts_with_filter(
             base_conditions.append(f"category IN ({placeholders})")
             base_params.extend([category.value for category in categories])
 
-        # Add selected tags conditions (AND logic)
-        for tag in selected_tags:
-            base_conditions.append("tags LIKE ?")
-            base_params.append(f"%{tag.strip()}%")
+        if has_been_opened:
+            base_conditions.append("opened_at IS NOT NULL")
+        elif has_been_opened is False:
+            base_conditions.append("opened_at IS NULL")
 
-        # For each tag to count, run a separate query
-        for tag in tags_to_count:
+        # For each category to count, run a separate query
+        for category in categories:
             # Start with the base conditions
             conditions = base_conditions.copy()
             params = base_params.copy()
 
-            # Add this specific tag condition
-            conditions.append("tags LIKE ?")
-            params.append(f"%{tag.strip()}%")
+            # Add this specific category condition
+            conditions.append("category = ?")
+            params.append(category.value)
 
             # Construct the full query
             stmt = """--sql
@@ -326,7 +332,7 @@ def get_tag_counts_with_filter(
 
             cursor.execute(stmt, params)
             count = cursor.fetchone()[0]
-            result[tag] = count
+            result[category.value] = count
 
         return result
 

invokeai/frontend/web/public/locales/en.json

@@ -1692,6 +1692,7 @@
         "filterByTags": "Filter by Tags",
         "yourWorkflows": "Your Workflows",
         "recentlyOpened": "Recently Opened",
+        "noRecentWorkflows": "No Recent Workflows",
         "private": "Private",
         "shared": "Shared",
         "browseWorkflows": "Browse Workflows",
@@ -1726,6 +1727,7 @@
         "loadWorkflow": "$t(common.load) Workflow",
         "autoLayout": "Auto Layout",
         "edit": "Edit",
+        "view": "View",
         "download": "Download",
         "copyShareLink": "Copy Share Link",
         "copyShareLinkForWorkflow": "Copy Share Link for Workflow",

invokeai/frontend/web/src/features/nodes/components/sidePanel/workflow/WorkflowLibrary/WorkflowLibraryListItemActions/ViewWorkflow.tsx

@@ -18,11 +18,11 @@ export const ViewWorkflow = ({ workflowId }: { workflowId: string }) => {
   );
 
   return (
-    <Tooltip label={t('workflows.edit')} closeOnScroll>
+    <Tooltip label={t('workflows.view')} closeOnScroll>
       <IconButton
         size="sm"
         variant="ghost"
-        aria-label={t('workflows.edit')}
+        aria-label={t('workflows.view')}
         onClick={handleClickLoad}
         icon={<PiEyeBold />}
       />