Update imports

das/atomese2metta/translator.py

@@ -1,7 +1,7 @@
 import re
 from abc import ABC
 from collections.abc import MutableSequence
-from typing import Iterable, Sequence, Union, Optional
+from typing import Iterable, Optional, Sequence, Union
 
 from .collections import OrderedSet
 

das/das.py

@@ -3,17 +3,17 @@
 import os
 from datetime import datetime
 
+from atomese2metta.translator import AtomType, Expression
+from hashing import Hasher
+from helpers import (evaluate_hash, get_filesize_mb, get_logger, get_mongodb,
+                     human_time)
+from metta_lex import MettaParser
 from pymongo.collection import Collection
 from pymongo.database import Database
 from pymongo.errors import DuplicateKeyError
 from pymongo.operations import DeleteMany
 from pymongo.results import InsertOneResult
 
-from atomese2metta.translator import AtomType, Expression
-from hashing import Hasher
-from helpers import get_mongodb, get_logger, evaluate_hash, get_filesize_mb, human_time
-from metta_lex import MettaParser
-
 logger = get_logger()
 
 

das/das_generate_file.py

@@ -1,17 +1,16 @@
-import re
 import argparse
 import logging
 import os
+import re
 import shutil
 from typing import Iterator, Optional
 
 from couchbase import exceptions as cb_exceptions
 from couchbase.auth import PasswordAuthenticator
 from couchbase.cluster import Cluster
 from couchbase.management.collections import CollectionSpec
-from pymongo.collection import Collection
-
 from helpers import get_logger, get_mongodb
+from pymongo.collection import Collection
 from util import AccumulatorClock, Clock, Statistics
 
 logger = get_logger()

das/das_upload_to_couch_from_file.py

@@ -7,7 +7,6 @@
 from couchbase.auth import PasswordAuthenticator
 from couchbase.cluster import Cluster
 from couchbase.management.collections import CollectionSpec
-
 from helpers import get_logger
 
 logger = get_logger()

das/hashing.py

@@ -3,7 +3,7 @@
 from operator import itemgetter
 from typing import Any, Union
 
-from .atomese2metta.translator import AtomType, Expression, MSet
+from das.atomese2metta.translator import AtomType, Expression, MSet
 
 
 class Hasher:

das/lex.py

@@ -1,8 +1,7 @@
 import argparse
 
-from ply.lex import lex
-
 from helpers import get_logger
+from ply.lex import lex
 
 logger = get_logger()
 

das/metta_lex.py

@@ -1,11 +1,11 @@
 import argparse
 from typing import Any, List, Union
 
-from ply.lex import lex
-
-from atomese2metta.translator import AtomType, Expression, MSet, UnorderedExpression
+from atomese2metta.translator import (AtomType, Expression, MSet,
+                                      UnorderedExpression)
 from hashing import Hasher
 from helpers import get_logger
+from ply.lex import lex
 
 logger = get_logger()
 

das/parser.py

@@ -5,7 +5,7 @@
 
 from atomese2metta.parser import LexParser
 from atomese2metta.translator import Translator
-from helpers import get_logger, get_filesize_mb, human_time
+from helpers import get_filesize_mb, get_logger, human_time
 
 logger = get_logger()
 

das/pattern_matcher/couch_mongo_db.py

@@ -8,6 +8,7 @@
 from couchbase.exceptions import DocumentNotFoundException
 from pymongo.collection import Collection
 from pymongo.database import Database
+
 from das.hashing import Hasher
 
 from .db_interface import DBInterface

das/pattern_matcher/pattern_matcher_test.py

@@ -1,13 +1,13 @@
 from copy import deepcopy
 
 import pytest
-from das.pattern_matcher.stub_db import StubDB
 
 from das.pattern_matcher.pattern_matcher import (And, CompatibilityStatus,
                                                  Link, LogicalExpression, Node,
                                                  Not, OrderedAssignment,
                                                  PatternMatchingAnswer,
                                                  UnorderedAssignment, Variable)
+from das.pattern_matcher.stub_db import StubDB
 
 
 def test_basic_matching():

das/query.py

@@ -3,17 +3,16 @@
 import os
 from datetime import datetime
 
+from atomese2metta.translator import AtomType, Expression
+from hashing import Hasher
+from helpers import get_mongodb
+from metta_lex import MettaParser
 from pymongo.collection import Collection
 from pymongo.database import Database
 from pymongo.errors import DuplicateKeyError
 from pymongo.operations import DeleteMany
 from pymongo.results import InsertOneResult
 
-from atomese2metta.translator import AtomType, Expression
-from hashing import Hasher
-from helpers import get_mongodb
-from metta_lex import MettaParser
-
 
 class QueryDas:
   NODE_COLLS = [

das/research/cache.py

@@ -6,7 +6,7 @@
 import couchbase.exceptions
 from couchbase.bucket import Bucket
 
-from heap import PrioritizedItem, Heap
+from das.research.heap import Heap, PrioritizedItem
 
 
 class CacheException(Exception):

das/research/das_couch_cached.py

@@ -5,12 +5,13 @@
 from couchbase.auth import PasswordAuthenticator
 from couchbase.cluster import Cluster
 from couchbase.management.collections import CollectionSpec
-from helpers import get_logger
 from pymongo.collection import Collection
 from pymongo.mongo_client import MongoClient
-from util import Clock, Statistics, AccumulatorClock
+from util import AccumulatorClock, Clock, Statistics
 
-from cache import CachedCouchbaseClient, CouchbaseClient, DocumentNotFoundException
+from das.helpers import get_logger
+from das.research.cache import (CachedCouchbaseClient, CouchbaseClient,
+                                DocumentNotFoundException)
 
 logger = get_logger()
 

das/unifier.py

@@ -1,14 +1,14 @@
-from cmath import exp
-import os
 import argparse
-from typing import Any, List, Union
+import os
+from cmath import exp
 from pprint import pprint
+from typing import Any, List, Union
 
-from ply.lex import lex
-
-from atomese2metta.translator import AtomType, Expression, MSet, UnorderedExpression
+from atomese2metta.translator import (AtomType, Expression, MSet,
+                                      UnorderedExpression)
 from hashing import Hasher
 from helpers import get_mongodb
+from ply.lex import lex
 
 
 class DAS:

das/util.py

@@ -3,7 +3,6 @@
 
 import numpy as np
 import pytest
-
 from helpers import get_logger
 
 logger = get_logger()

tests/test_parser.py

@@ -1,4 +1,4 @@
-from scripts.atomese2metta.parser import Parser, MultiprocessingParser, LexParser
+from das.atomese2metta.parser import Parser, MultiprocessingParser, LexParser
 
 
 def test_when_split_string_to_two_chunks():

tests/test_translator.py

@@ -1,4 +1,4 @@
-from scripts.atomese2metta.translator import Expression, MList, MSet
+from das.atomese2metta.translator import Expression, MList, MSet
 
 
 def test_given_a_expression_instance_then_should_return_a_string_with_parentheses():