Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Return OrderedPair from Jobresultbuilder class #67

Merged
merged 1 commit into from
Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flojoy/job_result_builder.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .data_container import DataContainer
from .data_container import DataContainer, OrderedPair
import numpy as np
from typing import Union
from .flojoy_instruction import FLOJOY_INSTRUCTION
Expand Down Expand Up @@ -67,4 +67,4 @@ def build(self):
def get_default_data(self) -> DataContainer:
x = np.arange(0, 1000, 1) # type:ignore
y = np.ones_like(x)
return DataContainer(x=x, y=y)
return OrderedPair(x=x, y=y)
3 changes: 1 addition & 2 deletions flojoy/small_memory.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# import os, sys
from typing import Any
from .dao import Dao

Expand Down Expand Up @@ -61,7 +60,7 @@ def read_memory(self, job_id: str, key: str):
case "dict":
return self.dao.get_obj(memory_key)
case "np_array":
return self.dao.get_np_array(memory_key, meta_data)
return self.dao.get_np_array(memory_key)
case "pd_dframe":
return self.dao.get_pd_dataframe(memory_key)
case _:
Expand Down