Skip to content

Commit 86bfbc7

Browse files
committed
Merge branch 'main' into errors_fixed
2 parents fac5ca2 + 9786433 commit 86bfbc7

23 files changed

+967
-152
lines changed

.DS_Store

-6 KB
Binary file not shown.

.fernignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,4 @@ src/axiomatic/client.py
44
src/axiomatic/document_helpers.py
55
src/axiomatic/magic.py
66
src/axiomatic/pic_helpers.py
7-
src/axiomatic/axtract/axtract_report.py
8-
src/axiomatic/axtract/__init__.py
9-
src/axiomatic/axtract/interactive_table.py
10-
src/axiomatic/axtract/models.py
11-
src/axiomatic/axtract/relation_graph.py
12-
src/axiomatic/axtract/validation_result.py
7+
src/axiomatic/axtract/

poetry.lock

Lines changed: 866 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "axiomatic"
33

44
[tool.poetry]
55
name = "axiomatic"
6-
version = "0.0.100"
6+
version = "0.0.109"
77
description = ""
88
readme = "README.md"
99
authors = []
@@ -35,7 +35,10 @@ Repository = 'https://github.com/axiomatic-ai/axiomatic-python-sdk'
3535

3636
[tool.poetry.dependencies]
3737
python = "^3.8"
38+
dill = ">=0.3.4"
39+
fastjsonschema = ">=2.21.1"
3840
httpx = ">=0.21.2"
41+
hypernetx = ">=2.0.0"
3942
ipywidgets = ">=7.0.0"
4043
pydantic = ">= 1.9.2"
4144
pydantic-core = "^2.18.2"

requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
dill>=0.3.4
2+
fastjsonschema>=2.21.1
13
httpx>=0.21.2
4+
hypernetx>=2.0.0
25
ipywidgets>=7.0.0
36
pydantic>= 1.9.2
47
pydantic-core==^2.18.2

src/.DS_Store

-6 KB
Binary file not shown.

src/axiomatic/.DS_Store

-8 KB
Binary file not shown.

src/axiomatic/__init__.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
PlotParserOutput,
5757
RefineCodeResponse,
5858
RefineComponentCodeResponse,
59-
ResponseEquation,
6059
ScheduleJobResponse,
6160
SolutionResponse,
6261
SolutionResponseSolutionValue,
@@ -84,16 +83,7 @@
8483
Z3Expression,
8584
)
8685
from .errors import UnprocessableEntityError
87-
from . import (
88-
code_execution,
89-
document,
90-
formalization,
91-
fso,
92-
lean,
93-
pic,
94-
requirements,
95-
tools,
96-
)
86+
from . import code_execution, document, formalization, fso, lean, pic, requirements, tools
9787
from .client import AsyncAxiomatic, Axiomatic
9888
from .environment import AxiomaticEnvironment
9989
from .version import __version__
@@ -157,7 +147,6 @@
157147
"PlotParserOutput",
158148
"RefineCodeResponse",
159149
"RefineComponentCodeResponse",
160-
"ResponseEquation",
161150
"ScheduleJobResponse",
162151
"SolutionResponse",
163152
"SolutionResponseSolutionValue",

src/axiomatic/axtract/axtract_report.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .relation_graph import generate_relation_graph
2-
from .models import EquationExtractionResponse
2+
from .. import EquationExtractionResponse
33
import os
44
import re
55

@@ -248,7 +248,7 @@ def create_report(report_data: EquationExtractionResponse, report_path: str = ".
248248
html_content += f"""
249249
<tr>
250250
<td>\\({symbol.key}\\)</td>
251-
<td>{symbol.value}</td>
251+
<td>{symbol.key}</td>
252252
</tr>
253253
"""
254254

src/axiomatic/axtract/interactive_table.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from IPython.display import display # type: ignore
33
import json # type: ignore
44
import os # type: ignore
5-
from .axtract_report import EquationExtractionResponse
6-
from .models import VariableRequirement
5+
from .. import EquationExtractionResponse, VariableRequirement
76

87

98
def _find_symbol(name, variable_dict):
@@ -410,6 +409,6 @@ def _create_variable_dict(equation_response: EquationExtractionResponse) -> dict
410409
for symbol in equation.latex_symbols:
411410
# Only add if not already present (avoid duplicates)
412411
if symbol.key not in variable_dict:
413-
variable_dict[symbol.key] = {"name": symbol.value}
412+
variable_dict[symbol.key] = {"name": symbol.key}
414413

415414
return variable_dict

0 commit comments

Comments
 (0)