From 49cf03fc212c813862453de5352436dc90d1e458 Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Thu, 15 Dec 2022 16:50:53 +0100 Subject: imports and init files --- bsie/apps/index.py | 7 ++----- bsie/base/__init__.py | 8 ++++---- bsie/base/reader.py | 8 ++++---- bsie/lib/__init__.py | 7 ++++++- bsie/reader/stat.py | 2 +- bsie/tools/__init__.py | 4 ++-- bsie/utils/bsfs.py | 3 ++- bsie/utils/node.py | 18 +++++++++--------- test/base/test_extractor.py | 9 ++++----- test/base/test_reader.py | 4 ++-- test/extractor/generic/test_constant.py | 5 ++--- test/extractor/generic/test_path.py | 10 ++++------ test/extractor/generic/test_stat.py | 10 ++++------ 13 files changed, 46 insertions(+), 49 deletions(-) diff --git a/bsie/apps/index.py b/bsie/apps/index.py index 821aa4c..aa26d0f 100644 --- a/bsie/apps/index.py +++ b/bsie/apps/index.py @@ -9,14 +9,11 @@ import argparse import os import typing -# bsfs imports -import bsfs - # bsie imports from bsie.base import errors -from bsie.lib.bsie import BSIE +from bsie.lib import BSIE from bsie.tools import builder -from bsie.utils.bsfs import URI +from bsie.utils import bsfs # exports __all__: typing.Sequence[str] = ( diff --git a/bsie/base/__init__.py b/bsie/base/__init__.py index 0154862..0d362cd 100644 --- a/bsie/base/__init__.py +++ b/bsie/base/__init__.py @@ -11,14 +11,14 @@ import typing # inner-module imports from . import errors -from . import extractor -from . import reader +from .extractor import Extractor +from .reader import Reader # exports __all__: typing.Sequence[str] = ( + 'Extractor', + 'Reader', 'errors', - 'extractor', - 'reader', ) ## EOF ## diff --git a/bsie/base/reader.py b/bsie/base/reader.py index b7eabf7..cbabd36 100644 --- a/bsie/base/reader.py +++ b/bsie/base/reader.py @@ -13,7 +13,7 @@ import abc import typing # bsie imports -from bsie.utils.bsfs import URI, typename +from bsie.utils import bsfs # exports __all__: typing.Sequence[str] = ( @@ -27,10 +27,10 @@ class Reader(abc.ABC): """Read and return some content from a file.""" def __str__(self) -> str: - return typename(self) + return bsfs.typename(self) def __repr__(self) -> str: - return f'{typename(self)}()' + return f'{bsfs.typename(self)}()' def __eq__(self, other: typing.Any) -> bool: return isinstance(other, type(self)) @@ -39,7 +39,7 @@ class Reader(abc.ABC): return hash(type(self)) @abc.abstractmethod - def __call__(self, path: URI) -> typing.Any: + def __call__(self, path: bsfs.URI) -> typing.Any: """Return some content of the file at *path*. Raises a `ReaderError` if the reader cannot make sense of the file format. """ diff --git a/bsie/lib/__init__.py b/bsie/lib/__init__.py index f6c9018..578c2c4 100644 --- a/bsie/lib/__init__.py +++ b/bsie/lib/__init__.py @@ -7,7 +7,12 @@ Author: Matthias Baumgartner, 2022 # imports import typing +# inner-module imports +from .bsie import BSIE + # exports -__all__: typing.Sequence[str] = [] +__all__: typing.Sequence[str] = ( + 'BSIE', + ) ## EOF ## diff --git a/bsie/reader/stat.py b/bsie/reader/stat.py index 592d912..fc5fb24 100644 --- a/bsie/reader/stat.py +++ b/bsie/reader/stat.py @@ -9,7 +9,7 @@ import os import typing # bsie imports -from bsie.base import reader, errors +from bsie.base import errors, reader # exports __all__: typing.Sequence[str] = ( diff --git a/bsie/tools/__init__.py b/bsie/tools/__init__.py index 8ca9620..803c321 100644 --- a/bsie/tools/__init__.py +++ b/bsie/tools/__init__.py @@ -9,12 +9,12 @@ import typing # inner-module imports from . import builder -from . import pipeline +from .pipeline import Pipeline # exports __all__: typing.Sequence[str] = ( 'builder', - 'pipeline', + 'Pipeline', ) ## EOF ## diff --git a/bsie/utils/bsfs.py b/bsie/utils/bsfs.py index a4b7626..c48049d 100644 --- a/bsie/utils/bsfs.py +++ b/bsie/utils/bsfs.py @@ -8,13 +8,14 @@ Author: Matthias Baumgartner, 2022 import typing # bsfs imports -from bsfs import schema +from bsfs import Open, schema from bsfs.namespace import Namespace from bsfs.utils import URI, typename, uuid # exports __all__: typing.Sequence[str] = ( 'Namespace', + 'Open', 'URI', 'schema', 'typename', diff --git a/bsie/utils/node.py b/bsie/utils/node.py index c9c494f..ecf39cd 100644 --- a/bsie/utils/node.py +++ b/bsie/utils/node.py @@ -8,7 +8,7 @@ Author: Matthias Baumgartner, 2022 import typing # bsie imports -from bsie.utils.bsfs import URI, typename +from bsie.utils import bsfs # exports __all__: typing.Sequence[str] = ( @@ -22,19 +22,19 @@ class Node(): """Lightweight Node, disconnected from any bsfs structures.""" # node type. - node_type: URI + node_type: bsfs.URI # node URI. - uri: URI + uri: bsfs.URI def __init__( self, - node_type: URI, - uri: URI, + node_type: bsfs.URI, + uri: bsfs.URI, ): # assign members - self.node_type = URI(node_type) - self.uri = URI(uri) + self.node_type = bsfs.URI(node_type) + self.uri = bsfs.URI(uri) def __eq__(self, other: typing.Any) -> bool: return isinstance(other, Node) \ @@ -45,9 +45,9 @@ class Node(): return hash((type(self), self.node_type, self.uri)) def __str__(self) -> str: - return f'{typename(self)}({self.node_type}, {self.uri})' + return f'{bsfs.typename(self)}({self.node_type}, {self.uri})' def __repr__(self) -> str: - return f'{typename(self)}({self.node_type}, {self.uri})' + return f'{bsfs.typename(self)}({self.node_type}, {self.uri})' ## EOF ## diff --git a/test/base/test_extractor.py b/test/base/test_extractor.py index be876ad..5410ae0 100644 --- a/test/base/test_extractor.py +++ b/test/base/test_extractor.py @@ -8,8 +8,7 @@ Author: Matthias Baumgartner, 2022 import unittest # bsie imports -from bsie.utils import ns -from bsie.utils.bsfs import schema as _schema, URI +from bsie.utils import bsfs, ns # objects to test from bsie.base import extractor @@ -19,7 +18,7 @@ from bsie.base import extractor class StubExtractor(extractor.Extractor): def __init__(self): - super().__init__(_schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + ''' + super().__init__(bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + ''' bse:author rdfs:subClassOf bsfs:Predicate ; rdfs:domain bsfs:Entity ; rdfs:range xsd:string ; @@ -53,9 +52,9 @@ class TestExtractor(unittest.TestCase): self.assertNotEqual(hash(ext), hash(sub)) def test_predicates(self): - schema = _schema.Schema.Empty() + schema = bsfs.schema.Schema.Empty() entity = schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity) - string = schema.literal(ns.bsfs.Literal).get_child(URI('http://www.w3.org/2001/XMLSchema#string')) + string = schema.literal(ns.bsfs.Literal).get_child(bsfs.URI('http://www.w3.org/2001/XMLSchema#string')) p_author = schema.predicate(ns.bsfs.Predicate).get_child(ns.bse.author, domain=entity, range=string) p_comment = schema.predicate(ns.bsfs.Predicate).get_child(ns.bse.comment, domain=entity, range=string) ext = StubExtractor() diff --git a/test/base/test_reader.py b/test/base/test_reader.py index 802b314..a907eb9 100644 --- a/test/base/test_reader.py +++ b/test/base/test_reader.py @@ -8,12 +8,12 @@ Author: Matthias Baumgartner, 2022 import unittest # objects to test -from bsie.base import reader +from bsie import base ## code ## -class StubReader(reader.Reader): +class StubReader(base.Reader): def __call__(self, path): raise NotImplementedError() diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py index 7f72ccf..9dbaced 100644 --- a/test/extractor/generic/test_constant.py +++ b/test/extractor/generic/test_constant.py @@ -8,8 +8,7 @@ Author: Matthias Baumgartner, 2022 import unittest # bsie imports -from bsie.utils import ns -from bsie.utils.node import Node +from bsie.utils import node as _node, ns # objects to test from bsie.extractor.generic.constant import Constant @@ -34,7 +33,7 @@ class TestConstant(unittest.TestCase): (ns.bse.comment, 'the quick brown fox jumps over the lazy dog.'), ] ext = Constant(schema, tuples) - node = Node(ns.bsfs.Entity, '') # Blank node + node = _node.Node(ns.bsfs.Entity, '') # Blank node p_author = ext.schema.predicate(ns.bse.author) p_comment = ext.schema.predicate(ns.bse.comment) entity = ext.schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity) diff --git a/test/extractor/generic/test_path.py b/test/extractor/generic/test_path.py index aa21b04..d2b6c61 100644 --- a/test/extractor/generic/test_path.py +++ b/test/extractor/generic/test_path.py @@ -8,10 +8,8 @@ Author: Matthias Baumgartner, 2022 import unittest # bsie imports -from bsie import base -from bsie.utils import ns -from bsie.utils.bsfs import schema -from bsie.utils.node import Node +from bsie.base import extractor +from bsie.utils import bsfs, node as _node, ns # objects to test from bsie.extractor.generic.path import Path @@ -31,7 +29,7 @@ class TestPath(unittest.TestCase): def test_schema(self): self.assertEqual(Path().schema, - schema.Schema.from_string(base.extractor.SCHEMA_PREAMBLE + ''' + bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + ''' bse:filename rdfs:subClassOf bsfs:Predicate ; rdfs:domain bsfs:Entity ; rdfs:range xsd:string ; @@ -40,7 +38,7 @@ class TestPath(unittest.TestCase): def test_extract(self): ext = Path() - node = Node(ns.bsfs.Entity, '') # Blank node + node = _node.Node(ns.bsfs.File, '') # Blank node content = '/tmp/foo/bar' p_filename = ext.schema.predicate(ns.bse.filename) entity = ext.schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity) diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py index bed5fab..6cfc57f 100644 --- a/test/extractor/generic/test_stat.py +++ b/test/extractor/generic/test_stat.py @@ -9,10 +9,8 @@ import os import unittest # bsie imports -from bsie import base -from bsie.utils import ns -from bsie.utils.bsfs import schema -from bsie.utils.node import Node +from bsie.base import extractor +from bsie.utils import bsfs, node as _node, ns # objects to test from bsie.extractor.generic.stat import Stat @@ -32,7 +30,7 @@ class TestStat(unittest.TestCase): def test_schema(self): self.assertEqual(Stat().schema, - schema.Schema.from_string(base.extractor.SCHEMA_PREAMBLE + ''' + bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + ''' bse:filesize rdfs:subClassOf bsfs:Predicate ; rdfs:domain bsfs:Entity ; rdfs:range xsd:integer ; @@ -41,7 +39,7 @@ class TestStat(unittest.TestCase): def test_extract(self): ext = Stat() - node = Node(ns.bsfs.Entity, '') # Blank node + node = _node.Node(ns.bsfs.File, '') # Blank node content = os.stat(__file__) p_filesize = ext.schema.predicate(ns.bse.filesize) entity = ext.schema.node(ns.bsfs.Node).get_child(ns.bsfs.Entity) -- cgit v1.2.3