Fix imports to match new namespace

Signed-off-by: Guillem Duran <guillem@sourced.tech>

Author: Guillem Duran

sourced/__init__.py

@@ -1,4 +1,4 @@
 """Common namespace for sourced tools."""
 # You must not include any other code and data in a namespace package's __init__.py
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+# import pkg_resources
+# pkg_resources.declare_namespace(__name__)

sourced/ml/__init__.py

@@ -0,0 +1 @@
+"""MLonCode research playground."""

sourced/ml/core/__init__.py

@@ -6,4 +6,4 @@
 except ImportError:
     pass
 
-__version__ = "0.8.3"
+__version__ = "0.8.3"

sourced/ml/core/algorithms/__init__.py

@@ -1,9 +1,9 @@
 # flake8: noqa
-from sourced.ml.algorithms.tf_idf import log_tf_log_idf
+from sourced.ml.core.algorithms.tf_idf import log_tf_log_idf
 from sourced.ml.core.algorithms.uast_ids_to_bag import UastIds2Bag, uast2sequence
-from sourced.ml.algorithms.uast_struct_to_bag import UastRandomWalk2Bag, UastSeq2Bag
-from sourced.ml.algorithms.uast_inttypes_to_nodes import Uast2QuantizedChildren
-from sourced.ml.algorithms.uast_inttypes_to_graphlets import Uast2GraphletBag
-from sourced.ml.algorithms.uast_to_role_id_pairs import Uast2RoleIdPairs
-from sourced.ml.algorithms.uast_id_distance import Uast2IdLineDistance, Uast2IdTreeDistance
-from sourced.ml.algorithms.uast_to_id_sequence import Uast2IdSequence
+from sourced.ml.core.algorithms.uast_struct_to_bag import UastRandomWalk2Bag, UastSeq2Bag
+from sourced.ml.core.algorithms.uast_inttypes_to_nodes import Uast2QuantizedChildren
+from sourced.ml.core.algorithms.uast_inttypes_to_graphlets import Uast2GraphletBag
+from sourced.ml.core.algorithms.uast_to_role_id_pairs import Uast2RoleIdPairs
+from sourced.ml.core.algorithms.uast_id_distance import Uast2IdLineDistance, Uast2IdTreeDistance
+from sourced.ml.core.algorithms.uast_to_id_sequence import Uast2IdSequence

sourced/ml/core/algorithms/uast_id_distance.py

@@ -4,7 +4,7 @@
 import bblfsh
 
 from sourced.ml.core.algorithms.uast_ids_to_bag import UastIds2Bag
-from sourced.ml.utils import bblfsh_roles
+from sourced.ml.core.utils import bblfsh_roles
 
 
 class Uast2IdDistance(UastIds2Bag):

sourced/ml/core/algorithms/uast_ids_to_bag.py

@@ -2,9 +2,9 @@
 
 import bblfsh
 
-from sourced.ml.algorithms import NoopTokenParser, TokenParser
-from sourced.ml.algorithms.uast_to_bag import Uast2BagBase
-from sourced.ml.utils import bblfsh_roles
+from sourced.ml.core.algorithms.token_parser import NoopTokenParser, TokenParser
+from sourced.ml.core.algorithms.uast_to_bag import Uast2BagBase
+from sourced.ml.core.utils import bblfsh_roles
 
 
 def uast2sequence(root):

sourced/ml/core/algorithms/uast_inttypes_to_graphlets.py

@@ -1,7 +1,7 @@
 from collections import defaultdict
 
 from sourced.ml.core.algorithms.uast_ids_to_bag import Uast2BagBase
-from sourced.ml.algorithms.uast_struct_to_bag import Node
+from sourced.ml.core.algorithms.uast_struct_to_bag import Node
 
 
 class Uast2GraphletBag(Uast2BagBase):

sourced/ml/core/algorithms/uast_inttypes_to_nodes.py

@@ -3,7 +3,7 @@
 from bblfsh import Node
 import numpy
 
-from sourced.ml.algorithms.uast_to_bag import Uast2BagThroughSingleScan
+from sourced.ml.core.algorithms.uast_to_bag import Uast2BagThroughSingleScan
 
 
 class Uast2QuantizedChildren(Uast2BagThroughSingleScan):

sourced/ml/core/algorithms/uast_struct_to_bag.py

@@ -1,8 +1,7 @@
 from collections import defaultdict
 import random
 
-from sourced.ml.algorithms import uast2sequence
-from sourced.ml.core.algorithms.uast_ids_to_bag import FakeVocabulary, Uast2BagBase
+from sourced.ml.core.algorithms.uast_ids_to_bag import FakeVocabulary, Uast2BagBase, uast2sequence
 
 
 class Uast2StructBagBase(Uast2BagBase):

sourced/ml/core/algorithms/uast_to_id_sequence.py

@@ -2,7 +2,7 @@
 
 import bblfsh
 
-from sourced.ml.algorithms.uast_id_distance import Uast2IdLineDistance
+from sourced.ml.core.algorithms.uast_id_distance import Uast2IdLineDistance
 
 
 class Uast2IdSequence(Uast2IdLineDistance):