Skip to content

Commit d0199d8

Browse files
committed
Merge branch 'main' into v0.2.x
2 parents 0f81b78 + c8c0e30 commit d0199d8

File tree

5 files changed

+32
-16
lines changed

5 files changed

+32
-16
lines changed

docs/source/autogen/lineapy.graph_reader.rst

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ lineapy.graph\_reader.session\_artifacts module
3434
.. automodule:: lineapy.graph_reader.session_artifacts
3535
:members:
3636

37+
lineapy.graph\_reader.types module
38+
----------------------------------
39+
40+
.. automodule:: lineapy.graph_reader.types
41+
:members:
42+
3743
lineapy.graph\_reader.utils module
3844
----------------------------------
3945

docs/source/autogen/lineapy.utils.rst

+6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ lineapy.utils.validate\_annotation\_spec module
7272
.. automodule:: lineapy.utils.validate_annotation_spec
7373
:members:
7474

75+
lineapy.utils.version module
76+
----------------------------
77+
78+
.. automodule:: lineapy.utils.version
79+
:members:
80+
7581
Module contents
7682
---------------
7783

lineapy/data/types.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ class SessionType(Enum):
3939
class SessionContext(BaseModel):
4040
"""
4141
Each trace of a script/notebook is a "Session".
42+
4243
:param working_directory: captures where the code ran by the user
4344
44-
- we should remove the dependency on the working_directory because
45-
its brittle
4645
"""
4746

4847
id: LineaID # populated on creation by uuid.uuid4()
@@ -87,11 +86,12 @@ class ValueType(Enum):
8786
8887
TODO
8988
----
90-
FIXME
9189
92-
- rename (need coordination with linea-server):
90+
rename (need coordination with linea-server)
91+
9392
- really `dataset` is a table
9493
- `value` means its a literal (e.g., int/str)
94+
9595
"""
9696

9797
chart = 1
@@ -312,8 +312,11 @@ class ImportNode(BaseNode):
312312
313313
These are optional because the info is acquired at runtime.
314314
315-
Note that this node is not actually used for execution (using `l_import` CallNodes),
316-
but more a decoration for metadata retrieval.
315+
.. note::
316+
317+
This node is not actually used for execution (using `l_import` CallNodes),
318+
but more a decoration for metadata retrieval.
319+
317320
"""
318321

319322
node_type: NodeType = NodeType.ImportNode

lineapy/db/db.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -594,8 +594,6 @@ def get_libraries_for_session(
594594
Gets all dependencies for a session, assuming all the libs in a
595595
particular session will be required to set up a new env.
596596
597-
TODO: I think this distinct is still broken, because we want to
598-
make it distinct on a subset of columns: session_id, name, and version.
599597
"""
600598
return (
601599
self.session.query(
@@ -682,7 +680,7 @@ def get_all_artifacts(self) -> List[ArtifactORM]:
682680
def get_nodes_for_session(self, session_id: LineaID) -> List[Node]:
683681
"""
684682
Get all the nodes associated with the session, which does
685-
NOT include things like SessionContext
683+
NOT include things like SessionContext
686684
"""
687685
node_orms = (
688686
self.session.query(BaseNodeORM)

lineapy/graph_reader/types.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,23 @@ class InputVariable:
66
"""
77
Class to generate code related input variable and it's default value
88
9-
default_args: a = 1
10-
parser_body: parser.add_arguemnt('--a', default=1, type=)
11-
parser_args: a = args.a
9+
:param variable_name: variable name
10+
:param value: variable value
11+
:param value_type: variable objec type
12+
13+
Attributes:
14+
default_args: ex: ``a = 1``
15+
parser_body: ex: ``parser.add_arguemnt('--a', default=1, type=int)``
16+
parser_args: ex: ``a = args.a``
1217
1318
"""
1419

15-
def __init__(
16-
self, variable_name, value, value_type, typing_info=None
17-
) -> None:
20+
def __init__(self, variable_name, value, value_type) -> None:
1821
self.variable_name = variable_name
1922
self.value = value
2023
self.value_type = value_type.__name__
2124
# placeholder for future support to allow user passing typing info
22-
self.typing_info = typing_info
25+
# self.typing_info = typing_info
2326
self.default_args = f"{self.variable_name} = {repr(self.value)}"
2427
self.parser_body = f"parser.add_argument('--{self.variable_name}', type={self.value_type}, default={repr(self.value)})"
2528
self.parser_args = f"{self.variable_name} = args.{self.variable_name}"

0 commit comments

Comments
 (0)