pydpm_xl 0.1.39rc32__py3-none-any.whl → 0.2.1__py3-none-any.whl

py_dpm/api/semantic.py

@@ -1,273 +1,16 @@
-from typing import Dict, Any, Optional
-from dataclasses import dataclass
+from typing import Optional
 
-# Import directly to avoid circular imports
-from antlr4 import CommonTokenStream, InputStream
-from py_dpm.grammar.dist.dpm_xlLexer import dpm_xlLexer
-from py_dpm.grammar.dist.dpm_xlParser import dpm_xlParser
-from py_dpm.grammar.dist.listeners import DPMErrorListener
-from py_dpm.AST.ASTConstructor import ASTVisitor
-from py_dpm.AST.check_operands import OperandsChecking
-from py_dpm.semantics import SemanticAnalyzer
-from py_dpm.db_utils import get_session, get_engine
-from py_dpm.Exceptions.exceptions import SemanticError
+from py_dpm.api.dpm_xl.semantic import (
+    SemanticAPI as _SemanticAPI,
+    SemanticValidationResult,
+    validate_expression as _validate_expression,
+    is_valid_semantics as _is_valid_semantics,
+)
 
 
-@dataclass
-class SemanticValidationResult:
-    """
-    Result of semantic validation.
-
-    Attributes:
-        is_valid (bool): Whether the semantic validation passed
-        error_message (Optional[str]): Error message if validation failed
-        error_code (Optional[str]): Error code if validation failed
-        expression (str): The original expression that was validated
-        validation_type (str): Type of validation performed
-        results (Optional[Any]): Additional results from semantic analysis
-    """
-
-    is_valid: bool
-    error_message: Optional[str]
-    error_code: Optional[str]
-    expression: str
-    validation_type: str
-    results: Optional[Any] = None
-
-
-class SemanticAPI:
-    """
-    API for DPM-XL semantic validation and analysis.
-
-    This class provides methods to perform semantic analysis on DPM-XL expressions,
-    including operand checking, data type validation, and structure validation.
-    """
-
-    def __init__(
-        self, database_path: Optional[str] = None, connection_url: Optional[str] = None
-    ):
-        """
-        Initialize the Semantic API.
-
-        Args:
-            database_path (Optional[str]): Path to SQLite database. If None, uses default from environment.
-            connection_url (Optional[str]): Full SQLAlchemy connection URL (e.g., postgresql://user:pass@host:port/db).
-                                          Takes precedence over database_path.
-        """
-        self.database_path = database_path
-        self.connection_url = connection_url
-
-        if connection_url:
-            # Create isolated engine and session for the provided connection URL
-            from sqlalchemy.orm import sessionmaker
-            from py_dpm.db_utils import create_engine_from_url
-
-            # Create engine for the connection URL (supports SQLite, PostgreSQL, MySQL, etc.)
-            self.engine = create_engine_from_url(connection_url)
-            session_maker = sessionmaker(bind=self.engine)
-            self.session = session_maker()
-
-        elif database_path:
-            # Create isolated engine and session for this specific database
-            from sqlalchemy import create_engine
-            from sqlalchemy.orm import sessionmaker
-            import os
-
-            # Create the database directory if it doesn't exist
-            db_dir = os.path.dirname(database_path)
-            if db_dir and not os.path.exists(db_dir):
-                os.makedirs(db_dir)
-
-            # Create engine for specific database path
-            db_connection_url = f"sqlite:///{database_path}"
-            self.engine = create_engine(db_connection_url, pool_pre_ping=True)
-            session_maker = sessionmaker(bind=self.engine)
-            self.session = session_maker()
-        else:
-            # Use default global connection
-            get_engine()
-            self.session = get_session()
-            self.engine = None
-
-        self.error_listener = DPMErrorListener()
-        self.visitor = ASTVisitor()
-
-    def validate_expression(
-        self, expression: str, release_id: Optional[int] = None
-    ) -> SemanticValidationResult:
-        """
-        Perform semantic validation on a DPM-XL expression.
-
-        This includes syntax validation, operands checking, data type validation,
-        and structure validation.
-
-        Args:
-            expression (str): The DPM-XL expression to validate
-            release_id (Optional[int]): Specific release ID for component filtering.
-                                       If None, uses live/latest release (EndReleaseID IS NULL).
-
-        Returns:
-            SemanticValidationResult: Result containing validation status and details
-
-        Example:
-            >>> from pydpm.api import SemanticAPI
-            >>> semantic = SemanticAPI()
-            >>> result = semantic.validate_expression("{tC_01.00, r0100, c0010} + {tC_01.00, r0200, c0010}")
-            >>> print(result.is_valid)
-            True
-
-            >>> # Validate for specific release
-            >>> result = semantic.validate_expression("{tC_01.00, r0100, c0010}", release_id=5)
-        """
-        try:
-            # Parse expression to AST
-            input_stream = InputStream(expression)
-            lexer = dpm_xlLexer(input_stream)
-            lexer._listeners = [self.error_listener]
-            token_stream = CommonTokenStream(lexer)
-
-            parser = dpm_xlParser(token_stream)
-            parser._listeners = [self.error_listener]
-            parse_tree = parser.start()
-
-            if parser._syntaxErrors > 0:
-                return SemanticValidationResult(
-                    is_valid=False,
-                    error_message="Syntax errors detected",
-                    error_code="SYNTAX_ERROR",
-                    expression=expression,
-                    validation_type="SEMANTIC",
-                )
+SemanticAPI = _SemanticAPI
 
-            # Generate AST
-            ast = self.visitor.visit(parse_tree)
 
-            # Perform semantic analysis
-            oc = OperandsChecking(
-                session=self.session,
-                expression=expression,
-                ast=ast,
-                release_id=release_id,
-            )
-            semanticAnalysis = SemanticAnalyzer.InputAnalyzer(expression)
-
-            semanticAnalysis.data = oc.data
-            semanticAnalysis.key_components = oc.key_components
-            semanticAnalysis.open_keys = oc.open_keys
-            semanticAnalysis.preconditions = oc.preconditions
-
-            results = semanticAnalysis.visit(ast)
-
-            return SemanticValidationResult(
-                is_valid=True,
-                error_message=None,
-                error_code=None,
-                expression=expression,
-                validation_type="SEMANTIC",
-                results=results,
-            )
-
-        except SemanticError as e:
-            return SemanticValidationResult(
-                is_valid=False,
-                error_message=str(e),
-                error_code=getattr(e, "code", None),
-                expression=expression,
-                validation_type="SEMANTIC",
-            )
-        except Exception as e:
-            return SemanticValidationResult(
-                is_valid=False,
-                error_message=str(e),
-                error_code="UNKNOWN",
-                expression=expression,
-                validation_type="SEMANTIC",
-            )
-
-    def analyze_expression(
-        self, expression: str, release_id: Optional[int] = None
-    ) -> Dict[str, Any]:
-        """
-        Perform detailed semantic analysis on a DPM-XL expression.
-
-        Args:
-            expression (str): The DPM-XL expression to analyze
-            release_id (Optional[int]): Specific release ID for component filtering.
-                                       If None, uses live/latest release.
-
-        Returns:
-            Dict[str, Any]: Detailed analysis results
-
-        Raises:
-            Exception: If analysis fails
-
-        Example:
-            >>> from pydpm.api import SemanticAPI
-            >>> semantic = SemanticAPI()
-            >>> analysis = semantic.analyze_expression("{tC_01.00, r0100, c0010}")
-            >>> # Analyze for specific release
-            >>> analysis = semantic.analyze_expression("{tC_01.00, r0100, c0010}", release_id=5)
-        """
-        result = self.validate_expression(expression, release_id=release_id)
-
-        if not result.is_valid:
-            raise Exception(f"Semantic analysis failed: {result.error_message}")
-
-        # Extract additional analysis information
-        analysis = {
-            "expression": expression,
-            "is_valid": True,
-            "results": result.results,
-            "data_types": (
-                getattr(result.results, "type", None) if result.results else None
-            ),
-            "components": (
-                getattr(result.results, "components", None) if result.results else None
-            ),
-        }
-
-        return analysis
-
-    def is_valid_semantics(
-        self, expression: str, release_id: Optional[int] = None
-    ) -> bool:
-        """
-        Quick check if expression has valid semantics.
-
-        Args:
-            expression (str): The DPM-XL expression to check
-            release_id (Optional[int]): Specific release ID for component filtering.
-                                       If None, uses live/latest release.
-
-        Returns:
-            bool: True if semantics are valid, False otherwise
-
-        Example:
-            >>> from pydpm.api import SemanticAPI
-            >>> semantic = SemanticAPI()
-            >>> is_valid = semantic.is_valid_semantics("{tC_01.00, r0100, c0010}")
-            >>> # Check for specific release
-            >>> is_valid = semantic.is_valid_semantics("{tC_01.00, r0100, c0010}", release_id=5)
-        """
-        result = self.validate_expression(expression, release_id=release_id)
-        return result.is_valid
-
-    def __del__(self):
-        """Clean up resources."""
-        try:
-            if hasattr(self, "session") and self.session:
-                self.session.close()
-        except Exception:
-            pass
-
-        try:
-            if hasattr(self, "engine") and self.engine is not None:
-                self.engine.dispose()
-        except Exception:
-            pass
-
-
-# Convenience functions for direct usage
 def validate_expression(
     expression: str,
     database_path: Optional[str] = None,
@@ -275,29 +18,16 @@ def validate_expression(
     release_id: Optional[int] = None,
 ) -> SemanticValidationResult:
     """
-    Convenience function to validate DPM-XL expression semantics.
-
-    Args:
-        expression (str): The DPM-XL expression to validate
-        database_path (Optional[str]): Path to SQLite database. If None, uses default from environment.
-        connection_url (Optional[str]): Full SQLAlchemy connection URL (e.g., postgresql://user:pass@host:port/db).
-        release_id (Optional[int]): Specific release ID for component filtering.
-                                   If None, uses live/latest release.
+    Backwards-compatible wrapper for semantic validation.
 
-    Returns:
-        SemanticValidationResult: Result containing validation status and details
-
-    Example:
-        >>> from pydpm.api.semantic import validate_expression
-        >>> result = validate_expression("{tC_01.00, r0100, c0010}", database_path="./database.db")
-        >>> # Using PostgreSQL
-        >>> result = validate_expression("{tC_01.00, r0100, c0010}",
-        ...     connection_url="postgresql://user:pass@host:5432/db")
-        >>> # Validate for specific release
-        >>> result = validate_expression("{tC_01.00, r0100, c0010}", database_path="./database.db", release_id=5)
+    This delegates to the DPM-XL SemanticAPI implementation.
     """
-    api = SemanticAPI(database_path=database_path, connection_url=connection_url)
-    return api.validate_expression(expression, release_id=release_id)
+    return _validate_expression(
+        expression,
+        database_path=database_path,
+        connection_url=connection_url,
+        release_id=release_id,
+    )
 
 
 def is_valid_semantics(
@@ -307,26 +37,20 @@ def is_valid_semantics(
     release_id: Optional[int] = None,
 ) -> bool:
     """
-    Convenience function to check if expression has valid semantics.
+    Backwards-compatible wrapper to check semantic validity.
+    """
+    return _is_valid_semantics(
+        expression,
+        database_path=database_path,
+        connection_url=connection_url,
+        release_id=release_id,
+    )
 
-    Args:
-        expression (str): The DPM-XL expression to check
-        database_path (Optional[str]): Path to SQLite database. If None, uses default from environment.
-        connection_url (Optional[str]): Full SQLAlchemy connection URL (e.g., postgresql://user:pass@host:port/db).
-        release_id (Optional[int]): Specific release ID for component filtering.
-                                   If None, uses live/latest release.
 
-    Returns:
-        bool: True if semantics are valid, False otherwise
+__all__ = [
+    "SemanticAPI",
+    "SemanticValidationResult",
+    "validate_expression",
+    "is_valid_semantics",
+]
 
-    Example:
-        >>> from pydpm.api.semantic import is_valid_semantics
-        >>> is_valid = is_valid_semantics("{tC_01.00, r0100, c0010}", database_path="./database.db")
-        >>> # Using PostgreSQL
-        >>> is_valid = is_valid_semantics("{tC_01.00, r0100, c0010}",
-        ...     connection_url="postgresql://user:pass@host:5432/db")
-        >>> # Check for specific release
-        >>> is_valid = is_valid_semantics("{tC_01.00, r0100, c0010}", database_path="./database.db", release_id=5)
-    """
-    api = SemanticAPI(database_path=database_path, connection_url=connection_url)
-    return api.is_valid_semantics(expression, release_id=release_id)

py_dpm/cli/__init__.py

@@ -0,0 +1,9 @@
+"""
+PyDPM Command Line Interface
+
+CLI commands for PyDPM operations.
+"""
+
+from py_dpm.cli.main import main as cli
+
+__all__ = ["cli"]

py_dpm/{client.py → cli/main.py}

@@ -6,11 +6,11 @@ import os
 import sys
 import pandas as pd
 
-from py_dpm.api import API, SemanticAPI
-from py_dpm.api.semantic import SemanticValidationResult
-from py_dpm.api.operation_scopes import OperationScopesAPI
-from py_dpm.migration import run_migration
-from py_dpm.Utils.tokens import (
+from py_dpm.api import SemanticAPI, SyntaxAPI
+from py_dpm.api.dpm_xl.semantic import SemanticValidationResult
+from py_dpm.api.dpm.operation_scopes import OperationScopesAPI
+from py_dpm.dpm.migration import run_migration
+from py_dpm.dpm_xl.utils.tokens import (
     CODE,
     ERROR,
     ERROR_CODE,
@@ -23,7 +23,7 @@ from py_dpm.Utils.tokens import (
     VALIDATION_TYPE,
     VARIABLES,
 )
-from py_dpm.Exceptions.exceptions import SemanticError
+from py_dpm.exceptions.exceptions import SemanticError
 
 
 console = Console()
@@ -86,7 +86,7 @@ def semantic(expression: str, release_id: int, dpm_version: str):
     semantic_api = SemanticAPI()
 
     if dpm_version:
-        from py_dpm.models import Release
+        from py_dpm.dpm.models import Release
 
         release_id = (
             semantic_api.session.query(Release.releaseid)
@@ -147,9 +147,11 @@ def syntax(expression: str):
     """Perform syntactic analysis on a DPM expression."""
 
     status = 0
-    api = API()
+    api = SyntaxAPI()
     try:
-        api.syntax_validation(expression)
+        result = api.validate_expression(expression)
+        if not result.is_valid:
+            raise SyntaxError(result.error_message or "Syntax errors detected")
         message_formatted = Text("Syntax OK", style="bold green")
     except SyntaxError as e:
         message = str(e)
@@ -319,7 +321,7 @@ def calculate_scopes(expression, operation_vid, tables, preconditions, release_i
                 modules_table.add_column("From Date", justify="center")
                 modules_table.add_column("To Date", justify="center")
 
-                from py_dpm.models import ModuleVersion
+                from py_dpm.dpm.models import ModuleVersion
 
                 for module_vid in result.module_versions:
                     module_df = ModuleVersion.get_module_version_by_vid(

py_dpm/dpm/__init__.py

@@ -0,0 +1,11 @@
+"""
+PyDPM Core
+
+General DPM functionality not specific to DPM-XL.
+Includes database layer, operation scopes, and DPM exploration.
+"""
+
+from py_dpm.dpm.models import *
+from py_dpm.dpm.utils import *
+
+__all__ = []