Skip to content

Commit

Permalink
Merge pull request #113 from uc-cdis/chore/use-absolute-path-in-imports
Browse files Browse the repository at this point in the history
Use absolute path in imports
  • Loading branch information
george42-ctds authored Dec 5, 2024
2 parents a7f98ba + 914d95e commit 4b9b700
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion datasimulator/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from cdislogging import get_logger

from .errors import UserError
from datasimulator.errors import UserError


logger = get_logger("data-simulator generator", log_level="info")
Expand Down
11 changes: 7 additions & 4 deletions datasimulator/graph.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import json
from os.path import join

from .node import Node, logger
from .errors import UserError, DictionaryError
from .generator import generate_list_numbers
from .utils import generate_list_numbers_from_file, get_graph_traversal_path
from datasimulator.node import Node, logger
from datasimulator.errors import UserError, DictionaryError
from datasimulator.generator import generate_list_numbers
from datasimulator.utils import (
generate_list_numbers_from_file,
get_graph_traversal_path,
)

EXCLUDED_NODE = ["program", "root", "data_release"]

Expand Down
14 changes: 8 additions & 6 deletions datasimulator/main.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import os
import argparse

from cdislogging import get_logger
from dictionaryutils import DataDictionary, dictionary

from .graph import Graph
from .submit_data_utils import submit_test_data
from .file_handling import write_submission_order_to_file
from cdislogging import get_logger
from datasimulator.graph import Graph
from datasimulator.submit_data_utils import submit_test_data
from datasimulator.file_handling import write_submission_order_to_file

logger = get_logger("data-simulator", log_level="info")


Expand Down Expand Up @@ -146,12 +147,13 @@ def run_submission_order_generation(graph, data_path, node_name=None):
file_path = os.path.join(data_path, "DataImportOrderPath.txt")
path_exists = os.path.exists(data_path)
if not path_exists:
raise Exception(f"Cannot create file because path does not exist. Here is the path we expect: '{data_path}'")
raise Exception(
f"Cannot create file because path does not exist. Here is the path we expect: '{data_path}'"
)
else:
write_submission_order_to_file(submission_order, file_path)



# python main.py simulate --url https://s3.amazonaws.com/dictionary-artifacts/bhcdictionary/0.4.3/schema.json --path ./data-simulator/sample_test_data --program DEV --project test
def main():
args = parse_arguments()
Expand Down
6 changes: 3 additions & 3 deletions datasimulator/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

from cdislogging import get_logger

from .errors import UserError, DictionaryError
from .generator import (
from datasimulator.errors import UserError, DictionaryError
from datasimulator.generator import (
generate_hash,
generate_datetime,
generate_string_data,
generate_array_data_type,
generate_consent_code,
generate_simple_primitive_data,
)
from .utils import is_mixed_type, random_choice, get_keys_list
from datasimulator.utils import is_mixed_type, random_choice, get_keys_list


# Ingnore system properties
Expand Down
2 changes: 1 addition & 1 deletion datasimulator/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
from functools import reduce

from .errors import UserError
from datasimulator.errors import UserError


def is_mixed_type(arr):
Expand Down

0 comments on commit 4b9b700

Please sign in to comment.