Merge pull request #31 from InKCre/codex/pyrefly-gate

chore(dx): add Pyrefly type gate

Author: xiaoland

.pre-commit-config.yaml

@@ -15,6 +15,12 @@ repos:
         language: system
         files: ^(.*\.py|pyproject\.toml|ruff\.toml)$
         pass_filenames: false
+      - id: typecheck
+        name: Check Pyrefly types
+        entry: pyrefly check --min-severity=warn --output-format=min-text --progress-bar=no
+        language: system
+        files: ^(app/|extensions/|libs/|migrations/|scripts/|tests/|utils/|run\.py$|pyproject\.toml$|pdm\.lock$)
+        pass_filenames: false
       - id: check-lock
         name: Check PDM lock
         entry: python scripts/check_lock.py

app/business/extension/main.py

@@ -2,7 +2,6 @@
 import typing
 import fastapi
 import sqlmodel
-import sqlalchemy
 import importlib
 import os
 import tomllib
@@ -34,13 +33,15 @@ def __init_subclass__(
     **kwargs,
   ) -> None:
     cls.__extid__ = ext_id
-    cls.__configcls__ = config_cls
+    # ConfigTV is bound by each concrete extension subclass; Python's type model
+    # cannot represent a class attribute specialized by that subclass binding.
+    cls.__configcls__ = config_cls  # pyrefly: ignore[no-access]
     cls.__configschema__ = config_cls.model_json_schema()
     return super().__init_subclass__(**kwargs)
 
   @classmethod
   def on_start(cls, app: fastapi.FastAPI, extension: ExtensionModel):
-    cls.config = cls.__configcls__(**(extension.config or {}))
+    cls.config = cls.__configcls__(**(extension.config or {}))  # pyrefly: ignore[no-access]
     with SessionLocal() as db:
       extension.config_schema = cls.__configschema__
       db.add(extension)
@@ -63,7 +64,10 @@ def _init_sources(cls): ...
 
   @classmethod
   async def on_close(cls):
-    ExtensionManager.save_config(ext_id=cls.__extid__, config=cls.config)
+    ExtensionManager.save_config(
+      ext_id=cls.__extid__,
+      config=cls.config,  # pyrefly: ignore[missing-attribute]
+    )
     LOGGER.info(f"Extension {cls.__extid__} closed.")
 
   @classmethod
@@ -81,9 +85,9 @@ def update_config(cls, new_config: dict | ConfigTV):
     :param new_config:
     """
     if isinstance(new_config, dict):
-      cls.config = cls.__configcls__(**new_config)
+      cls.config = cls.__configcls__(**new_config)  # pyrefly: ignore[no-access]
     else:
-      cls.config = new_config
+      cls.config = new_config  # pyrefly: ignore[no-access]
 
 
 class ExtensionManager:
@@ -316,9 +320,8 @@ def get_installed(
       if enabled_only:
         client_id = ClientManager.get_current_client_id()
         # Filter: client_id must be in the enabled array
-        query = query.where(
-          ExtensionModel.enabled.any(client_id, operator=sqlalchemy.sql.operators.eq)
-        )
+        enabled_column = typing.cast(typing.Any, ExtensionModel.enabled)
+        query = query.where(enabled_column.any(client_id))
 
       return tuple(db.exec(query).all())
 
@@ -435,7 +438,7 @@ def sync(cls):
       # Runtime artifacts are immutable. Database-only records are never downloaded.
       all_db_extensions = db.exec(sqlmodel.select(ExtensionModel)).all()
       db_only = sorted(
-        str(extension.id)
+        extension.id
         for extension in all_db_extensions
         if extension.id not in local_extensions
       )

app/business/info_base/block.py

@@ -25,6 +25,7 @@
 )
 from app.schemas.info_base.relation import RelationID, RelationModel
 from app.schemas.info_base.main import Vector
+from app.schemas.info_base.storage import StorageID
 
 if typing.TYPE_CHECKING:
   from app.business.info_base.resolver import Resolver
@@ -137,7 +138,7 @@ async def fetchsert(cls, block: BlockModel, db_session: sqlmodel.Session) -> Blo
     db_session.flush()
     db_session.refresh(block)
     # and embedding - use sink service
-    await EmbeddingManager.upsert_block_embedding(block, db_session)
+    await EmbeddingManager.upsert_block_embedding(block=block, db_session=db_session)
 
     return block
 
@@ -149,15 +150,15 @@ async def organize(cls, block: BlockModel):
     """
     with SessionLocal() as db_session:
       resolver = ResolverManager.get(block)
-      generator = (await resolver.breakdown())()
+      generator = resolver.breakdown()
       try:
-        i = generator.send(None)
+        item = await anext(generator)
         while True:
-          db_session.add(i)
+          db_session.add(item)
           db_session.flush()
-          db_session.refresh(i)
-          i = generator.send(i)
-      except StopIteration:
+          db_session.refresh(item)
+          item = await generator.asend(item)
+      except StopAsyncIteration:
         pass
 
       db_session.commit()
@@ -209,16 +210,19 @@ def iterate_one(inner_block_id: int):
         sqlmodel.select(RelationModel).where(RelationModel.from_ == inner_block_id)
       ).all()
 
-      r_relations.update(relation.id for relation in relations)
+      r_relations.update(relation.id for relation in relations if relation.id is not None)
 
       for relation in relations:
         block = db_session.exec(
           sqlmodel.select(BlockModel).where(BlockModel.id == relation.to_)
         ).one()
-        r_blocks.add(block.id)
+        persisted_block_id = block.id
+        if persisted_block_id is None:
+          raise RuntimeError("Persisted block is missing its database ID")
+        r_blocks.add(persisted_block_id)
 
         if depth <= max_depth:
-          iterate_one(block.id)
+          iterate_one(persisted_block_id)
 
       depth += 1
 
@@ -372,7 +376,7 @@ def edit_block(
     block_id: BlockID,
     content: Opt[str] = None,
     resolver: Opt[ResolverType] = None,
-    storage: Opt[str] | Undefined = _undefined,
+    storage: Opt[StorageID] | Undefined = _undefined,
   ) -> BlockModel:
     """编辑块"""
     logger.info("Editing block", extra={"block_id": block_id})

app/business/info_base/resolver/html.py

@@ -2,7 +2,7 @@
 from .main import Resolver
 
 
-class HTMLResolver(Resolver, rso_type="html"):
+class HTMLResolver(Resolver[str, str], rso_type="html"):
   @classmethod
   def create_graph(cls, url: str):
     from app.schemas.info_base.main import SubGraphForm
@@ -13,17 +13,17 @@ def create_graph(cls, url: str):
   async def get_text(self) -> str:
     from app.business.info_base.block import BlockManager
     from app.business.info_base.relation import RelationManager
-    from app.business.info_base.storage import StorageManager
 
     out_relations = RelationManager.get(
-      self._block.id, include_in=False, content="text content"
+      self.block_id, include_in=False, content="text content"
     )
     if out_relations:
       block = BlockManager.get(out_relations[0].to_)
       if block is not None:
-        storage = StorageManager.new_storage(block)
-        return await storage.get_content(block)
-    storage = StorageManager.new_storage(self._block)
-    content = await storage.get_content(self._block)
-    content = html2text.HTML2Text().handle(content)
-    return content
+        return block.content
+    content = await self.get_raw_content()
+    return html2text.HTML2Text().handle(content)
+
+  async def get_str_for_embedding(self) -> str:
+    """Use the rendered text as the embedding input."""
+    return await self.get_text()