Added /raw/region/info

Author: squaresmile

app/core/nice/svt/ascensionAdd.py

@@ -81,9 +81,9 @@ def get_nice_ascensionAdd(
                     **base_settings_id,
                     suffix=strParam["changeGraphSuffix"],
                 )
-                ascensionAdd["charaGraphChange"]["ascension"][limit.limitCount] = (
-                    asset_url
-                )
+                ascensionAdd["charaGraphChange"]["ascension"][
+                    limit.limitCount
+                ] = asset_url
             if "changeIconCommonReleaseId" in strParam:
                 nice_release = [
                     get_nice_common_release(cr)

app/redis/helpers/repo_version.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from ...config import Settings
-from ...schemas.common import Region, RepoInfo
+from ...schemas.common import Region, RegionInfo, RepoInfo
 from .. import Redis
 
 
@@ -22,3 +22,21 @@ async def set_repo_version(redis: Redis, region: Region, repo_info: RepoInfo) ->
     redis_key = f"{settings.redis_prefix}:repo_version:{region.name}"
     redis_data = repo_info.json()
     await redis.set(redis_key, redis_data)
+
+
+async def get_region_version(redis: Redis, region: Region) -> Optional[RegionInfo]:
+    redis_key = f"{settings.redis_prefix}:region_version:{region.name}"
+    item_redis = await redis.get(redis_key)
+
+    if not item_redis:  # pragma: no cover
+        return None
+
+    return RegionInfo.model_validate_json(item_redis)
+
+
+async def set_region_version(
+    redis: Redis, region: Region, repo_info: RegionInfo
+) -> None:
+    redis_key = f"{settings.redis_prefix}:region_version:{region.name}"
+    redis_data = repo_info.model_dump_json()
+    await redis.set(redis_key, redis_data)

app/routers/raw.py

@@ -1,12 +1,13 @@
-from fastapi import APIRouter, Depends, Query, Response
+from fastapi import APIRouter, Depends, HTTPException, Query, Response
 from fastapi_cache.decorator import cache
 
 from ..config import Settings
 from ..core import raw, search
 from ..db.helpers.cc import get_cc_id
 from ..db.helpers.svt import get_ce_id, get_svt_id
 from ..redis import Redis
-from ..schemas.common import Region, ReverseDepth
+from ..redis.helpers.repo_version import get_region_version
+from ..schemas.common import Region, RegionInfo, ReverseDepth
 from ..schemas.enums import AiType
 from ..schemas.raw import (
     AiCollection,
@@ -58,6 +59,23 @@
 router = APIRouter(prefix="/raw", tags=["raw"])
 
 
+@router.get(
+    "/{region}/info",
+    response_model=RegionInfo,
+    response_model_exclude_unset=True,
+    responses=get_error_code([400, 404]),
+)
+async def get_region_repo_info(
+    region: Region,
+    redis: Redis = Depends(get_redis),
+) -> Response:
+    region_info = await get_region_version(redis, region)
+    if region_info:
+        return item_response(region_info)
+
+    raise HTTPException(status_code=404, detail="Region repo info not found.")
+
+
 svt_expand_lore_description = """
 - **expand**: Add expanded skill objects to mstSvt.expandedClassPassive
 from the skill IDs in mstSvt.classPassive.

app/schemas/common.py

@@ -18,6 +18,20 @@ class RepoInfo(BaseModelORJson):
     timestamp: int
 
 
+class RegioinAssetBundle(BaseModelORJson):
+    folderName: str
+    animalName: str
+    zooName: str
+
+
+class RegionInfo(RepoInfo):
+    serverHash: str
+    serverTimestamp: int
+    dataVer: int | None = None
+    dateVer: int | None = None
+    assetbundle: RegioinAssetBundle | None = None
+
+
 class Region(StrEnum):
     """Region Enum"""
 

app/tasks.py

@@ -45,11 +45,16 @@
 from .export.constants import export_constants
 from .models.raw import mstSvtExtra
 from .redis import Redis
-from .redis.helpers.repo_version import get_repo_version, set_repo_version
+from .redis.helpers.repo_version import (
+    get_region_version,
+    get_repo_version,
+    set_region_version,
+    set_repo_version,
+)
 from .redis.load import load_redis_data, load_svt_extra_redis
 from .routers.utils import list_string
 from .schemas.base import BaseModelORJson
-from .schemas.common import Language, Region, RepoInfo
+from .schemas.common import Language, Region, RegionInfo, RepoInfo
 from .schemas.enums import ALL_ENUMS, TRAIT_NAME
 from .schemas.gameenums import NiceItemType, SvtType
 from .schemas.nice import (
@@ -603,10 +608,11 @@ async def generate_exports(
                         orjson.loads(info_path.read_bytes())
                     )
 
-            export_info = await load_export_info(region, region_path[region])
-            if repo_info:
-                export_info = repo_info.model_dump(mode="json") | export_info
-            await dump_normal(export_path, "info", export_info)
+            export_info = await get_region_version(redis, region)
+            if export_info:
+                await dump_normal(
+                    export_path, "info", export_info.model_dump(mode="json")
+                )
 
             if enable_webhook:
                 await report_webhooks(region_path, "export")
@@ -647,7 +653,7 @@ async def generate_exports(
             logger.info(f"Exported {region} data in {run_time:.2f}s.")
 
 
-async def load_export_info(
+async def get_region_info(
     region: Region, region_folder: DirectoryPath
 ) -> dict[str, Any]:
     export_info: dict[str, Any] = {}
@@ -684,6 +690,12 @@ async def update_master_repo_info(
             )
             await set_repo_version(redis, region, repo_info)
 
+            region_info = await get_region_info(region, region_path[region])
+            region_info = repo_info.model_dump(mode="json") | region_info
+            await set_region_version(
+                redis, region, RegionInfo.model_validate(region_info)
+            )
+
 
 async def clear_redis_cache(
     redis: Redis,

scripts/extract_enums.py

@@ -775,7 +775,7 @@ def cs_enum_to_ts(cs_enums: list[str], raw_class: str, nice_class: str) -> list[
         "NiceBuffConditionType",
         "Condition Type for Conditional Battle Buff",
         "BUFF_CONDITION_TYPE",
-    )
+    ),
 ]