Skip to content

Commit

Permalink
fix validator and requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
ncerutti committed Feb 22, 2024
1 parent 502e601 commit 72ce9fe
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ coverage.xml
*.xlsx#

# venv
venv/
.venv/

# vscode
.vscode/
13 changes: 8 additions & 5 deletions ods_tools/odtf/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import threading
from datetime import datetime
from typing import Any, Type
import yaml

from .config import Config, TransformationConfig
from .connector import BaseConnector
Expand Down Expand Up @@ -66,7 +67,7 @@ def _run_transformation(self, config: TransformationConfig):
try:
mapping_class: Type[BaseMapping] = self._load_from_module(
config.get(
"mapping.path", fallback="converter.mapping.FileMapping"
"mapping.path", fallback="ods_tools.odtf.mapping.FileMapping"
)
)
mapping: BaseMapping = mapping_class(
Expand All @@ -77,7 +78,7 @@ def _run_transformation(self, config: TransformationConfig):

extractor_class: Type[BaseConnector] = self._load_from_module(
config.get(
"extractor.path", fallback="converter.connector.CsvConnector"
"extractor.path", fallback="ods_tools.odtf.connector.CsvConnector"
)
)
extractor: BaseConnector = extractor_class(
Expand All @@ -86,15 +87,15 @@ def _run_transformation(self, config: TransformationConfig):

loader_class: Type[BaseConnector] = self._load_from_module(
config.get(
"loader.path", fallback="converter.connector.CsvConnector"
"loader.path", fallback="odtf.connector.CsvConnector"
)
)
loader: BaseConnector = loader_class(
config, **config.get("loader.options", fallback={})
)

runner_class: Type[BaseRunner] = self._load_from_module(
config.get("runner.path", fallback="converter.runner.PandasRunner")
config.get("runner.path", fallback=".runner.PandasRunner")
)
runner: BaseRunner = runner_class(
config, **config.get("runner.options", fallback={})
Expand All @@ -109,6 +110,8 @@ def _run_transformation(self, config: TransformationConfig):


def transform_format(path_to_config_file):
config = Config(config_path=path_to_config_file)
with open(path_to_config_file, 'r') as file:
config_dict = yaml.safe_load(file)
config = Config(config_dict)
controller = Controller(config)
controller.run()
4 changes: 2 additions & 2 deletions ods_tools/odtf/validator_pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ def run_entry(
data[field_name] = 1
fields.add(field_name)

res = super().run_entry(data[fields], entry)
res = super().run_entry(data[list(fields)], entry)

data.drop(columns=[field_name], inplace=True)
return res
else:
return super().run_entry(data[fields], entry)
return super().run_entry(data[list(fields)], entry)

def group_data(
self,
Expand Down
7 changes: 7 additions & 0 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ jsonref
oasis-data-manager
packaging
PyYAML
lark
pyodbc
sqlparams
sqlparse
psycopg2
networkx
dask

0 comments on commit 72ce9fe

Please sign in to comment.