From 196f63491455e86a773ae236e125bb7f171ea596 Mon Sep 17 00:00:00 2001 From: P Punith Krishna Date: Thu, 1 Jun 2023 00:56:55 -0700 Subject: [PATCH] Moved drepr extension under export extension module, renamed drepr script as main.py --- sand/controllers/table.py | 3 +-- .../extensions/{ => export}/drepr/__init__.py | 0 .../drepr/main.py} | 19 +++++-------------- .../drepr/raw_transformations/__init__.py | 0 .../raw_transformations/global_coordinate.py | 0 .../drepr/raw_transformations/number.py | 0 .../{ => export}/drepr/resources.py | 0 .../{ => export}/drepr/semanticmodel.py | 0 .../{ => export}/drepr/transformation.py | 0 9 files changed, 6 insertions(+), 16 deletions(-) rename sand/extensions/{ => export}/drepr/__init__.py (100%) rename sand/extensions/{drepr/relational2rdf.py => export/drepr/main.py} (88%) create mode 100644 sand/extensions/export/drepr/raw_transformations/__init__.py rename sand/extensions/{ => export}/drepr/raw_transformations/global_coordinate.py (100%) rename sand/extensions/{ => export}/drepr/raw_transformations/number.py (100%) rename sand/extensions/{ => export}/drepr/resources.py (100%) rename sand/extensions/{ => export}/drepr/semanticmodel.py (100%) rename sand/extensions/{ => export}/drepr/transformation.py (100%) diff --git a/sand/controllers/table.py b/sand/controllers/table.py index f5dd6b4..b4d8ec2 100644 --- a/sand/controllers/table.py +++ b/sand/controllers/table.py @@ -8,11 +8,10 @@ get_dataclass_deserializer, get_deserializer_from_type, ) -from rsoup.rsoup import ContentHierarchy from sand.models import SemanticModel, Table, TableRow from sand.models.ontology import OntClassAR, OntPropertyAR from sand.models.table import Link -from sand.extensions.drepr.relational2rdf import DreprExport +from sand.extensions.export.drepr.main import DreprExport from sand.serializer import ( get_label, ) diff --git a/sand/extensions/drepr/__init__.py b/sand/extensions/export/drepr/__init__.py similarity index 100% rename from sand/extensions/drepr/__init__.py rename to sand/extensions/export/drepr/__init__.py diff --git a/sand/extensions/drepr/relational2rdf.py b/sand/extensions/export/drepr/main.py similarity index 88% rename from sand/extensions/drepr/relational2rdf.py rename to sand/extensions/export/drepr/main.py index a497992..45b0bf2 100644 --- a/sand/extensions/drepr/relational2rdf.py +++ b/sand/extensions/export/drepr/main.py @@ -1,9 +1,5 @@ -from dataclasses import dataclass -from io import StringIO -import orjson, csv -from typing import Dict, List, Set, Tuple, cast +from typing import List, Set from sand.config import SETTINGS -from sand.models.entity import NIL_ENTITY, Entity from sand.models.ontology import OntProperty, OntPropertyAR, OntPropertyDataType from sand.models.table import Table, TableRow import sm.outputs.semantic_model as O @@ -19,22 +15,17 @@ IndexExpr, RangeExpr, RangeAlignment, - ValueAlignment, - AlignmentType, AlignedStep, Preprocessing, PreprocessingType, PMap, - ResourceDataString, ) -import drepr.models.sm as drepr_sm -from drepr.engine import execute, FileOutput, OutputFormat, MemoryOutput -from uuid import uuid4 +from drepr.engine import execute, OutputFormat, MemoryOutput from slugify import slugify from sand.extension_interface.export import IExport -from sand.extensions.drepr.resources import get_entity_resource, get_table_resource -from sand.extensions.drepr.semanticmodel import get_drepr_sm, get_entity_data_nodes -from sand.extensions.drepr.transformation import has_transformation, get_transformation +from sand.extensions.export.drepr.resources import get_entity_resource, get_table_resource +from sand.extensions.export.drepr.semanticmodel import get_drepr_sm, get_entity_data_nodes +from sand.extensions.export.drepr.transformation import has_transformation, get_transformation class DreprExport(IExport): diff --git a/sand/extensions/export/drepr/raw_transformations/__init__.py b/sand/extensions/export/drepr/raw_transformations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sand/extensions/drepr/raw_transformations/global_coordinate.py b/sand/extensions/export/drepr/raw_transformations/global_coordinate.py similarity index 100% rename from sand/extensions/drepr/raw_transformations/global_coordinate.py rename to sand/extensions/export/drepr/raw_transformations/global_coordinate.py diff --git a/sand/extensions/drepr/raw_transformations/number.py b/sand/extensions/export/drepr/raw_transformations/number.py similarity index 100% rename from sand/extensions/drepr/raw_transformations/number.py rename to sand/extensions/export/drepr/raw_transformations/number.py diff --git a/sand/extensions/drepr/resources.py b/sand/extensions/export/drepr/resources.py similarity index 100% rename from sand/extensions/drepr/resources.py rename to sand/extensions/export/drepr/resources.py diff --git a/sand/extensions/drepr/semanticmodel.py b/sand/extensions/export/drepr/semanticmodel.py similarity index 100% rename from sand/extensions/drepr/semanticmodel.py rename to sand/extensions/export/drepr/semanticmodel.py diff --git a/sand/extensions/drepr/transformation.py b/sand/extensions/export/drepr/transformation.py similarity index 100% rename from sand/extensions/drepr/transformation.py rename to sand/extensions/export/drepr/transformation.py