TBNilles/LEANN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: fix lint (remove unused passages_file); keep per-instance reuse only

Browse Source
This commit is contained in:
Andy Lee
2025-08-13 23:51:25 -07:00
parent 10bfe9c980
commit 8cfd5d6a8a
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/leann-core/src/leann/embedding_server_manager.py
View File

@@ -81,12 +81,12 @@ class EmbeddingServerManager:
**kwargs, **kwargs,
) -> tuple[bool, int]: ) -> tuple[bool, int]:
"""Start the embedding server.""" """Start the embedding server."""
passages_file = kwargs.get("passages_file") # passages_file may be present in kwargs for server CLI, but we don't need it here
# Check if we have a compatible server already running in-process # If this manager already has a live server, just reuse it
if self._has_compatible_running_server(model_name, passages_file, embedding_mode): if self.server_process and self.server_process.poll() is None and self.server_port:
logger.info("Reusing in-process compatible server") logger.info("Reusing in-process server")
return True, self.server_port or port return True, self.server_port
# For Colab environment, use a different strategy # For Colab environment, use a different strategy
if _is_colab_environment(): if _is_colab_environment():
@@ -131,20 +131,7 @@ class EmbeddingServerManager:
logger.error(f"Failed to start embedding server in Colab: {e}") logger.error(f"Failed to start embedding server in Colab: {e}")
return False, actual_port return False, actual_port
def _has_compatible_running_server( # Note: No compatibility check needed; manager is per-searcher and configs are stable per instance
self, model_name: str, passages_file: str, embedding_mode: str
) -> bool:
"""Check if current in-process server matches desired config."""
if not (self.server_process and self.server_process.poll() is None and self.server_port):
return False
if not self._server_config:
return False
cfg = self._server_config
return (
cfg.get("model_name") == model_name
and cfg.get("passages_file") == passages_file
and cfg.get("embedding_mode", "sentence-transformers") == embedding_mode
)
def _start_new_server( def _start_new_server(
self, port: int, model_name: str, embedding_mode: str, **kwargs self, port: int, model_name: str, embedding_mode: str, **kwargs