elastro-client 1.3.52__tar.gz → 1.3.53__tar.gz

{elastro_client-1.3.52/elastro_client.egg-info → elastro_client-1.3.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elastro-client
-Version: 1.3.52
+Version: 1.3.53
 Summary: A comprehensive Python library for Elasticsearch management with both programmatic and CLI interfaces
 Author: Austin Jorgensen
 License-Expression: MIT

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/__init__.py

@@ -4,7 +4,7 @@ Elasticsearch Management Module.
 A module for managing Elasticsearch operations within a pipeline process.
 """
 
-__version__ = "1.3.52"
+__version__ = "1.3.53"
 
 # Core component imports
 from elastro.core.client import ElasticsearchClient

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/cli/cli.py

@@ -303,10 +303,3 @@ def main() -> None:
 
 if __name__ == "__main__":
     main()
-
-
-def dummy_critic_trigger() -> None:
-    try:
-        print("testing meta critic")
-    except Exception:
-        pass

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/core/client.py

@@ -1,4 +1,3 @@
-# mypy: ignore-errors
 """
 Elasticsearch client module.
 
@@ -106,7 +105,7 @@ class ElasticsearchClient:
                 self.auth = {"api_key": api_key}
 
         self.client_kwargs = kwargs
-        self._client = None
+        self._client: Optional[Elasticsearch] = None
         self._connected = False
 
         logger.debug(f"Initialized ElasticsearchClient with hosts: {self.hosts}")

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/core/middleware.py

@@ -24,7 +24,9 @@ class ASTNodeIDMiddleware:
     def process(self, query: Dict[str, Any]) -> Dict[str, Any]:
         """Inspects query. Adds structural markers or raises if malformed."""
         if self.enforce:
-            # Placeholder for actual AST Node-ID bridging validation
-            # Ensures semantic queries conform to known graph topologies
-            pass
+            # TODO: Implement AST Node-ID bridging validation.
+            # Should ensure semantic queries conform to known graph topologies.
+            raise NotImplementedError(
+                "AST Node-ID bridging validation is not yet implemented"
+            )
         return query

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/core/rag/ast_parser.py

@@ -1,4 +1,3 @@
-# mypy: ignore-errors
 """
 Abstract Syntax Tree (AST) parser utilizing tree-sitter for Graph RAG Code Flow Mapping.
 Supports polyglot analysis of Python, Go, JavaScript, TypeScript, and Vue.

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/core/rag/ingestor.py

@@ -7,12 +7,12 @@ Updated with Semantic Chunking and BM25 Support.
 
 import os
 import json
-import logging
 from typing import List, Dict, Any, Generator, Optional
 from elastro.core.client import ElasticsearchClient
 from elastro.core.rag.ast_parser import ASTParser
+from elastro.core.logger import get_logger
 
-logger = logging.getLogger("elastro.rag")
+logger = get_logger(__name__)
 
 
 class GraphRAGManager:

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/core/validation.py

@@ -1,11 +1,10 @@
-# mypy: ignore-errors
 """
 Validation module.
 
 This module provides functionality for validating Elasticsearch operations.
 """
 
-from typing import Dict, Any, Optional, List, Union
+from typing import Dict, Any, Optional, List, Type, Union
 from pydantic import (
     BaseModel,
     ValidationError as PydanticValidationError,
@@ -127,7 +126,7 @@ class Validator:
     documents, queries, and other Elasticsearch operations.
     """
 
-    def validate_index_settings(self, settings: Dict[str, Any]) -> None:
+    def validate_index_settings(self, settings: Dict[str, Any]) -> Dict[str, Any]:
         """
         Validate index settings.
 
@@ -152,7 +151,7 @@ class Validator:
                 f"Invalid index settings: {', '.join(error_messages)}"
             )
 
-    def validate_index_mappings(self, mappings: Dict[str, Any]) -> None:
+    def validate_index_mappings(self, mappings: Dict[str, Any]) -> Dict[str, Any]:
         """
         Validate index mappings.
 
@@ -243,18 +242,22 @@ class Validator:
                 raise
             raise ValidationError(f"Document validation failed: {str(e)}")
 
-    def validate_query(self, query: Dict[str, Any]) -> None:
+    def validate_query(self, query: Dict[str, Any]) -> Dict[str, Any]:
         """
         Validate Elasticsearch query.
 
         Args:
             query: Elasticsearch query
 
+        Returns:
+            Dict containing the validated query fields
+
         Raises:
             ValidationError: If query validation fails
         """
         try:
             # Determine query type
+            model_cls: Type[QueryModel]
             if "match" in query:
                 model_cls = MatchQuery
             elif "term" in query:
@@ -276,7 +279,7 @@ class Validator:
             ]
             raise ValidationError(f"Invalid query: {', '.join(error_messages)}")
 
-    def validate_datastream_settings(self, settings: Dict[str, Any]) -> None:
+    def validate_datastream_settings(self, settings: Dict[str, Any]) -> Dict[str, Any]:
         """
         Validate datastream settings.
 

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/server.py

@@ -3,7 +3,6 @@ import sys
 import io
 import secrets
 import json
-import logging
 import multiprocessing
 import shlex
 import subprocess
@@ -15,6 +14,9 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.responses import HTMLResponse
 from fastapi.middleware.cors import CORSMiddleware
 from elastro.core.client import ElasticsearchClient
+from elastro.core.logger import get_logger
+
+logger = get_logger(__name__)
 
 # Optional Pydantic based schema since Elastro uses Pydantic
 from pydantic import BaseModel
@@ -259,7 +261,7 @@ class ElastroGUI:
                     )
 
                 except Exception as e:
-                    logging.error(f"Failed to connect to {c['name']}: {str(e)}")
+                    logger.error(f"Failed to connect to {c['name']}: {str(e)}")
                     results.append(
                         {
                             "name": c["name"],
@@ -331,7 +333,7 @@ class ElastroGUI:
                     ilm_policies = es.ilm.get_lifecycle()
                     ilm_count = len(ilm_policies)
                 except Exception as e:
-                    logging.warning(f"Could not fetch ILM for {cluster_name}: {e}")
+                    logger.warning(f"Could not fetch ILM for {cluster_name}: {e}")
                     ilm_count = 0
 
                 # Snapshots / Backups
@@ -343,7 +345,7 @@ class ElastroGUI:
                             {"name": r_name, "type": r_data.get("type", "unknown")}
                         )
                 except Exception as e:
-                    logging.warning(f"Could not fetch Repos for {cluster_name}: {e}")
+                    logger.warning(f"Could not fetch Repos for {cluster_name}: {e}")
 
                 # Indices detailed summary
                 idx_res = es.cat.indices(format="json")
@@ -374,7 +376,7 @@ class ElastroGUI:
                 }
 
             except Exception as e:
-                logging.error(f"Failed to fetch details for {cluster_name}: {str(e)}")
+                logger.error(f"Failed to fetch details for {cluster_name}: {str(e)}")
                 raise HTTPException(
                     status_code=500,
                     detail=f"Failed communicating with Elasticsearch: {str(e)}",
@@ -574,7 +576,7 @@ class ElastroGUI:
                             }
                         )
                     except Exception as e:
-                        logging.error(f"Failed to explain {name}: {e}")
+                        logger.error(f"Failed to explain {name}: {e}")
                         results.append(
                             {
                                 "index": name,

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/utils/health.py

@@ -1,4 +1,3 @@
-# mypy: ignore-errors
 """Health check and diagnostics utilities for Elasticsearch."""
 
 from typing import Dict, List, Any, Optional, Union
@@ -50,9 +49,9 @@ class HealthManager:
                 params["wait_for_status"] = wait_for_status
 
             if index:
-                return self._es.cluster.health(index=index, **params)
+                return dict(self._es.cluster.health(index=index, **params))
             else:
-                return self._es.cluster.health(**params)
+                return dict(self._es.cluster.health(**params))
         except Exception as e:
             raise OperationError(f"Failed to get cluster health: {str(e)}")
 
@@ -73,13 +72,15 @@ class HealthManager:
         """
         try:
             if node_id and metrics:
-                return self._es.nodes.stats(node_id=node_id, metric=",".join(metrics))
+                return dict(
+                    self._es.nodes.stats(node_id=node_id, metric=",".join(metrics))
+                )
             elif node_id:
-                return self._es.nodes.stats(node_id=node_id)
+                return dict(self._es.nodes.stats(node_id=node_id))
             elif metrics:
-                return self._es.nodes.stats(metric=",".join(metrics))
+                return dict(self._es.nodes.stats(metric=",".join(metrics)))
             else:
-                return self._es.nodes.stats()
+                return dict(self._es.nodes.stats())
         except Exception as e:
             raise OperationError(f"Failed to get node stats: {str(e)}")
 
@@ -100,13 +101,15 @@ class HealthManager:
         """
         try:
             if node_id and metrics:
-                return self._es.nodes.info(node_id=node_id, metric=",".join(metrics))
+                return dict(
+                    self._es.nodes.info(node_id=node_id, metric=",".join(metrics))
+                )
             elif node_id:
-                return self._es.nodes.info(node_id=node_id)
+                return dict(self._es.nodes.info(node_id=node_id))
             elif metrics:
-                return self._es.nodes.info(metric=",".join(metrics))
+                return dict(self._es.nodes.info(metric=",".join(metrics)))
             else:
-                return self._es.nodes.info()
+                return dict(self._es.nodes.info())
         except Exception as e:
             raise OperationError(f"Failed to get node info: {str(e)}")
 
@@ -120,7 +123,7 @@ class HealthManager:
             OperationError: If cluster stats retrieval fails.
         """
         try:
-            return self._es.cluster.stats()
+            return dict(self._es.cluster.stats())
         except Exception as e:
             raise OperationError(f"Failed to get cluster stats: {str(e)}")
 
@@ -167,9 +170,9 @@ class HealthManager:
                 body["primary"] = primary
 
             if body:
-                return self._es.cluster.allocation_explain(body=body)
+                return dict(self._es.cluster.allocation_explain(body=body))
             else:
-                return self._es.cluster.allocation_explain()
+                return dict(self._es.cluster.allocation_explain())
         except Exception as e:
             raise OperationError(f"Failed to explain allocation: {str(e)}")
 
@@ -186,7 +189,9 @@ class HealthManager:
             OperationError: If settings retrieval fails.
         """
         try:
-            return self._es.cluster.get_settings(include_defaults=include_defaults)
+            return dict(
+                self._es.cluster.get_settings(include_defaults=include_defaults)
+            )
         except Exception as e:
             raise OperationError(f"Failed to get cluster settings: {str(e)}")
 
@@ -203,7 +208,7 @@ class HealthManager:
             OperationError: If repository verification fails.
         """
         try:
-            response = self._es.snapshot.verify_repository(repository=repository)
+            response = self._es.snapshot.verify_repository(name=repository)
             return "nodes" in response
         except Exception as e:
             raise OperationError(f"Failed to verify repository {repository}: {str(e)}")
@@ -222,9 +227,9 @@ class HealthManager:
         """
         try:
             if index:
-                return self._es.indices.stats(index=index)
+                return dict(self._es.indices.stats(index=index))
             else:
-                return self._es.indices.stats()
+                return dict(self._es.indices.stats())
         except Exception as e:
             raise OperationError(f"Failed to get index stats: {str(e)}")
 

{elastro_client-1.3.52 → elastro_client-1.3.53}/elastro/utils/snapshots.py

@@ -1,4 +1,3 @@
-# mypy: ignore-errors
 """Snapshot and restore utilities for Elasticsearch."""
 
 from typing import Dict, List, Any, Optional, Union
@@ -71,7 +70,7 @@ class SnapshotManager:
                 config = repo_config
 
             response = self._es.snapshot.create_repository(
-                repository=config.name,
+                name=config.name,
                 body={"type": config.type, "settings": config.settings},
             )
             return bool(response.get("acknowledged", False))
@@ -98,7 +97,7 @@ class SnapshotManager:
             OperationError: If repository deletion fails.
         """
         try:
-            response = self._es.snapshot.delete_repository(repository=name)
+            response = self._es.snapshot.delete_repository(name=name)
             return response.get("acknowledged", False)
         except Exception as e:
             raise OperationError(f"Failed to delete repository {name}: {str(e)}")
@@ -118,9 +117,9 @@ class SnapshotManager:
         """
         try:
             if name:
-                return self._es.snapshot.get_repository(repository=name)
+                return dict(self._es.snapshot.get_repository(name=name))
             else:
-                return self._es.snapshot.get_repository()
+                return dict(self._es.snapshot.get_repository())
         except Exception as e:
             raise OperationError(f"Failed to get repository information: {str(e)}")
 
@@ -207,7 +206,9 @@ class SnapshotManager:
                     OperationError: If snapshot retrieval fails.
         """
         try:
-            return self._es.snapshot.get(repository=repo_name, snapshot=snapshot_name)
+            return dict(
+                self._es.snapshot.get(repository=repo_name, snapshot=snapshot_name)
+            )
         except Exception as e:
             raise OperationError(f"Failed to get snapshot information: {str(e)}")
 
@@ -244,11 +245,13 @@ class SnapshotManager:
                 body["rename_pattern"] = rename_pattern
                 body["rename_replacement"] = rename_replacement
 
-            return self._es.snapshot.restore(
-                repository=repo_name,
-                snapshot=snapshot_name,
-                body=body,
-                wait_for_completion=wait_for_completion,
+            return dict(
+                self._es.snapshot.restore(
+                    repository=repo_name,
+                    snapshot=snapshot_name,
+                    body=body,
+                    wait_for_completion=wait_for_completion,
+                )
             )
         except Exception as e:
             raise OperationError(
@@ -272,12 +275,14 @@ class SnapshotManager:
         """
         try:
             if repo_name and snapshot_name:
-                return self._es.snapshot.status(
-                    repository=repo_name, snapshot=snapshot_name
+                return dict(
+                    self._es.snapshot.status(
+                        repository=repo_name, snapshot=snapshot_name
+                    )
                 )
             elif repo_name:
-                return self._es.snapshot.status(repository=repo_name)
+                return dict(self._es.snapshot.status(repository=repo_name))
             else:
-                return self._es.snapshot.status()
+                return dict(self._es.snapshot.status())
         except Exception as e:
             raise OperationError(f"Failed to get snapshot status: {str(e)}")

{elastro_client-1.3.52 → elastro_client-1.3.53/elastro_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elastro-client
-Version: 1.3.52
+Version: 1.3.53
 Summary: A comprehensive Python library for Elasticsearch management with both programmatic and CLI interfaces
 Author: Austin Jorgensen
 License-Expression: MIT

{elastro_client-1.3.52 → elastro_client-1.3.53}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elastro-client"
-version = "1.3.52"
+version = "1.3.53"
 description = "A comprehensive Python library for Elasticsearch management with both programmatic and CLI interfaces"
 readme = "README.md"
 requires-python = ">=3.9,<3.14"

{elastro_client-1.3.52 → elastro_client-1.3.53}/tests/unit/utils/test_health.py

@@ -387,7 +387,7 @@ class TestHealthManager(unittest.TestCase):
 
         # Assertions
         self.mock_es.snapshot.verify_repository.assert_called_once_with(
-            repository="test-repo"
+            name="test-repo"
         )
         self.assertTrue(result)
 

{elastro_client-1.3.52 → elastro_client-1.3.53}/tests/unit/utils/test_snapshots.py

@@ -109,7 +109,7 @@ class TestSnapshotManager:
         result = snapshot_manager.create_repository(repo_config)
         assert result is True
         mock_elasticsearch.snapshot.create_repository.assert_called_once_with(
-            repository="test-repo",
+            name="test-repo",
             body={"type": "fs", "settings": {"location": "/backup/es_snapshots"}},
         )
 
@@ -124,7 +124,7 @@ class TestSnapshotManager:
         result = snapshot_manager.create_repository(repo_config)
         assert result is True
         mock_elasticsearch.snapshot.create_repository.assert_called_once_with(
-            repository="test-repo",
+            name="test-repo",
             body={"type": "fs", "settings": {"location": "/backup/es_snapshots"}},
         )
 
@@ -152,7 +152,7 @@ class TestSnapshotManager:
         result = snapshot_manager.delete_repository("test-repo")
         assert result is True
         mock_elasticsearch.snapshot.delete_repository.assert_called_once_with(
-            repository="test-repo"
+            name="test-repo"
         )
 
     def test_delete_repository_error(self, snapshot_manager, mock_elasticsearch):
@@ -181,7 +181,7 @@ class TestSnapshotManager:
         result = snapshot_manager.get_repository("test-repo")
         assert result == mock_response
         mock_elasticsearch.snapshot.get_repository.assert_called_once_with(
-            repository="test-repo"
+            name="test-repo"
         )
 
     def test_get_all_repositories(self, snapshot_manager, mock_elasticsearch):