working

Author: tymekaxai

src/axiomatic/axtract/axtract_report.py

@@ -1,5 +1,5 @@
 from .relation_graph import generate_relation_graph
-from .. import EquationExtractionResponse
+from .. import EquationProcessingResponse
 import os
 import re
 
@@ -190,7 +190,7 @@
 """
 
 
-def create_report(report_data: EquationExtractionResponse, report_path: str = "./report.html"):
+def create_report(report_data: EquationProcessingResponse, report_path: str = "./report.html"):
     """
     Creates an HTML report for the extracted equations.
     """

src/axiomatic/axtract/relation_graph.py

@@ -1,5 +1,5 @@
 from typing import List
-from .. import EquationExtraction
+from ..types.equation_processing import ResponseEquation
 from pyvis.network import Network  # type: ignore
 
 
@@ -20,7 +20,7 @@ def normalize_latex_symbol(symbol: str) -> str:
     return symbol
 
 
-def generate_relation_graph(equations: List[EquationExtraction]) -> str:
+def generate_relation_graph(equations: List[ResponseEquation]) -> str:
     """
     Generates HTML code for a bipartite graph visualization.
     Green nodes represent equations, red nodes represent variables.
@@ -41,7 +41,7 @@ def generate_relation_graph(equations: List[EquationExtraction]) -> str:
     # Add equation nodes (green) and variable nodes (red)
     for eq in equations:
         # Add equation node with unique identifier
-        eq_name = f"Eq: {eq.name} ({eq.id})"  # Add ID to make each node unique
+        eq_name = f"Eq: {eq.name}"  # Add ID to make each node unique
         net.add_node(
             eq_name,
             label=eq.name,

src/axiomatic/client.py

@@ -116,7 +116,7 @@ def analyze_equations(
 
     def validate_equations(
         self,
-        requirements: List[VariableRequirement],
+        requirements: Sequence[VariableRequirement],
         loaded_equations: EquationProcessingResponse,
         include_internal_model: bool = False,
     ) -> EquationValidationResult:
@@ -131,7 +131,6 @@ def validate_equations(
         Returns:
             EquationValidationResult containing the validation results
         """
-        # Convert loaded_equations to dict first to ensure proper serialization
         equations_dict = loaded_equations.model_dump() if hasattr(loaded_equations, 'model_dump') else loaded_equations.dict()
 
         request_body = ValidateEquationsBody(
@@ -140,7 +139,7 @@ def validate_equations(
             include_internal_model=include_internal_model
         )
 
-        api_response = self._ax_client.document.equation.validate(request=request_body.model_dump())
+        api_response = self._ax_client.document.equation.validate(request=request_body)
 
         return api_response
 

src/axiomatic/document/equation/client.py

@@ -15,7 +15,7 @@
 from ...types.equation_extraction_response import EquationExtractionResponse
 from ...types.equation_processing_response import EquationProcessingResponse
 from ...core.client_wrapper import AsyncClientWrapper
-
+from ...types.validate_equations_body import ValidateEquationsBody
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
 
@@ -67,7 +67,7 @@ def user_variables(self, *, request_options: typing.Optional[RequestOptions] = N
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def validate(
-        self, *, request: typing.Sequence[VariableRequirement], request_options: typing.Optional[RequestOptions] = None
+        self, *, request: ValidateEquationsBody, request_options: typing.Optional[RequestOptions] = None
     ) -> EquationValidationResult:
         """
         Validates a set of variables against stored equations to check for inconsistencies.