From 17649e3be2b06faed14cf496cbd10d05aad1c4bd Mon Sep 17 00:00:00 2001 From: haikdc Date: Sun, 5 Apr 2026 19:00:18 -0700 Subject: [PATCH] [Haik]: renamed registry_refresh_loop folder to RegistryRefreshLoop. Also created a SkillStore folder containing the relevant content so both singeltons are roughly organized the same --- .../RegistryRefreshLoop.py | 2 +- .../fetch_all_registry_skills.py | 4 +-- .../utils/fetch_one_skill.py | 0 .../utils/fetch_skill_paths.py | 0 backend/apps/skills/{ => SkillStore}/Skill.py | 0 .../skills/{ => SkillStore}/SkillStore.py | 2 +- .../registry_refresh_loop.py | 35 ------------------- backend/apps/skills/skills.py | 4 +-- 8 files changed, 6 insertions(+), 41 deletions(-) rename backend/apps/skills/{registry_refresh_loop => RegistryRefreshLoop}/RegistryRefreshLoop.py (88%) rename backend/apps/skills/{registry_refresh_loop => RegistryRefreshLoop}/fetch_all_registry_skills/fetch_all_registry_skills.py (86%) rename backend/apps/skills/{registry_refresh_loop => RegistryRefreshLoop}/fetch_all_registry_skills/utils/fetch_one_skill.py (100%) rename backend/apps/skills/{registry_refresh_loop => RegistryRefreshLoop}/fetch_all_registry_skills/utils/fetch_skill_paths.py (100%) rename backend/apps/skills/{ => SkillStore}/Skill.py (100%) rename backend/apps/skills/{ => SkillStore}/SkillStore.py (97%) delete mode 100644 backend/apps/skills/registry_refresh_loop/registry_refresh_loop.py diff --git a/backend/apps/skills/registry_refresh_loop/RegistryRefreshLoop.py b/backend/apps/skills/RegistryRefreshLoop/RegistryRefreshLoop.py similarity index 88% rename from backend/apps/skills/registry_refresh_loop/RegistryRefreshLoop.py rename to backend/apps/skills/RegistryRefreshLoop/RegistryRefreshLoop.py index 4e4ea58f..74ebd5b1 100644 --- a/backend/apps/skills/registry_refresh_loop/RegistryRefreshLoop.py +++ b/backend/apps/skills/RegistryRefreshLoop/RegistryRefreshLoop.py @@ -5,7 +5,7 @@ from typing import Optional from typeguard import typechecked from pydantic import BaseModel, Field, InstanceOf -from backend.apps.skills.registry_refresh_loop.fetch_all_registry_skills.fetch_all_registry_skills import fetch_all_registry_skills +from backend.apps.skills.RegistryRefreshLoop.fetch_all_registry_skills.fetch_all_registry_skills import fetch_all_registry_skills class RegistryRefreshLoop(BaseModel): diff --git a/backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/fetch_all_registry_skills.py b/backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/fetch_all_registry_skills.py similarity index 86% rename from backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/fetch_all_registry_skills.py rename to backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/fetch_all_registry_skills.py index 49cc7767..03722c12 100644 --- a/backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/fetch_all_registry_skills.py +++ b/backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/fetch_all_registry_skills.py @@ -5,8 +5,8 @@ import asyncio import httpx from typeguard import typechecked -from backend.apps.skills.registry_refresh_loop.fetch_all_registry_skills.utils.fetch_skill_paths import fetch_skill_paths -from backend.apps.skills.registry_refresh_loop.fetch_all_registry_skills.utils.fetch_one_skill import fetch_one_skill +from backend.apps.skills.RegistryRefreshLoop.fetch_all_registry_skills.utils.fetch_skill_paths import fetch_skill_paths +from backend.apps.skills.RegistryRefreshLoop.fetch_all_registry_skills.utils.fetch_one_skill import fetch_one_skill @typechecked diff --git a/backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/utils/fetch_one_skill.py b/backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/utils/fetch_one_skill.py similarity index 100% rename from backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/utils/fetch_one_skill.py rename to backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/utils/fetch_one_skill.py diff --git a/backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/utils/fetch_skill_paths.py b/backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/utils/fetch_skill_paths.py similarity index 100% rename from backend/apps/skills/registry_refresh_loop/fetch_all_registry_skills/utils/fetch_skill_paths.py rename to backend/apps/skills/RegistryRefreshLoop/fetch_all_registry_skills/utils/fetch_skill_paths.py diff --git a/backend/apps/skills/Skill.py b/backend/apps/skills/SkillStore/Skill.py similarity index 100% rename from backend/apps/skills/Skill.py rename to backend/apps/skills/SkillStore/Skill.py diff --git a/backend/apps/skills/SkillStore.py b/backend/apps/skills/SkillStore/SkillStore.py similarity index 97% rename from backend/apps/skills/SkillStore.py rename to backend/apps/skills/SkillStore/SkillStore.py index 85460cc1..15eaaa1f 100644 --- a/backend/apps/skills/SkillStore.py +++ b/backend/apps/skills/SkillStore/SkillStore.py @@ -1,5 +1,5 @@ import json -from backend.apps.skills.Skill import Skill +from backend.apps.skills.SkillStore.Skill import Skill from typeguard import typechecked from pydantic import BaseModel import os diff --git a/backend/apps/skills/registry_refresh_loop/registry_refresh_loop.py b/backend/apps/skills/registry_refresh_loop/registry_refresh_loop.py deleted file mode 100644 index 83eb24f1..00000000 --- a/backend/apps/skills/registry_refresh_loop/registry_refresh_loop.py +++ /dev/null @@ -1,35 +0,0 @@ - - - -import asyncio -from datetime import time - -from typeguard import typechecked -from backend.apps.skills.registry_refresh_loop.fetch_all_registry_skills.fetch_all_registry_skills import fetch_all_registry_skills - -@typechecked -async def registry_refresh_loop( - # Args needed for the loop - refresh_interval_s: int, - registry_cache: dict[str, dict], - registry_updated_at: float, - # Args needed for fetch_all_registry_skills - num_concurrent_fetches: int, - manifest_url: str, - raw_base: str, - repo: str, - branch: str, -) -> None: - while True: - try: - registry_cache = await fetch_all_registry_skills( - num_concurrent_fetches=num_concurrent_fetches, - manifest_url=manifest_url, - raw_base=raw_base, - repo=repo, - branch=branch, - ) - registry_updated_at = time.time() - except Exception as e: - print(f"[registry_refresh_loop] Skill registry refresh error: {e}") - await asyncio.sleep(refresh_interval_s) \ No newline at end of file diff --git a/backend/apps/skills/skills.py b/backend/apps/skills/skills.py index 8da78a94..fef7271f 100644 --- a/backend/apps/skills/skills.py +++ b/backend/apps/skills/skills.py @@ -11,9 +11,9 @@ from pydantic import BaseModel from backend.config.Apps import SubApp from backend.config.paths import DB_ROOT -from backend.apps.skills.SkillStore import SkillStore +from backend.apps.skills.SkillStore.SkillStore import SkillStore from backend.apps.skills.parse_frontmatter import parse_frontmatter -from backend.apps.skills.registry_refresh_loop.RegistryRefreshLoop import RegistryRefreshLoop +from backend.apps.skills.RegistryRefreshLoop.RegistryRefreshLoop import RegistryRefreshLoop logger = logging.getLogger(__name__)