janus-llm 3.2.0__tar.gz → 3.3.0__tar.gz

{janus_llm-3.2.0 → janus_llm-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: janus-llm
-Version: 3.2.0
+Version: 3.3.0
 Summary: A transcoding library using LLMs.
 Home-page: https://github.com/janus-llm/janus-llm
 License: Apache 2.0

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/__init__.py

@@ -2,10 +2,10 @@ import warnings
 
 from langchain_core._api.deprecation import LangChainDeprecationWarning
 
-from .converter.translate import Translator
-from .metrics import *  # noqa: F403
+from janus.converter.translate import Translator
+from janus.metrics import *  # noqa: F403
 
-__version__ = "3.2.0"
+__version__ = "3.3.0"
 
 # Ignoring a deprecation warning from langchain_core that I can't seem to hunt down
 warnings.filterwarnings("ignore", category=LangChainDeprecationWarning)

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/_tests/test_cli.py

@@ -4,9 +4,9 @@ from unittest.mock import ANY, patch
 
 from typer.testing import CliRunner
 
-from ..cli import app, translate
-from ..embedding.embedding_models_info import EMBEDDING_MODEL_CONFIG_DIR
-from ..llm.models_info import MODEL_CONFIG_DIR
+from janus.cli import app, translate
+from janus.embedding.embedding_models_info import EMBEDDING_MODEL_CONFIG_DIR
+from janus.llm.models_info import MODEL_CONFIG_DIR
 
 
 class TestCli(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/cli.py

@@ -108,7 +108,7 @@ embedding = typer.Typer(
 
 def version_callback(value: bool) -> None:
     if value:
-        from . import __version__ as version
+        from janus import __version__ as version
 
         print(f"Janus CLI [blue]v{version}[/blue]")
         raise typer.Exit()

janus_llm-3.3.0/janus/converter/__init__.py

@@ -0,0 +1,6 @@
+from janus.converter.converter import Converter
+from janus.converter.diagram import DiagramGenerator
+from janus.converter.document import Documenter, MadLibsDocumenter, MultiDocumenter
+from janus.converter.evaluate import Evaluator
+from janus.converter.requirements import RequirementsDocumenter
+from janus.converter.translate import Translator

janus_llm-3.3.0/janus/converter/_tests/test_translate.py

@@ -0,0 +1,156 @@
+import unittest
+from pathlib import Path
+from typing import Any, Iterable, List, Optional, Type
+
+import pytest
+from langchain.schema import Document
+from langchain.schema.embeddings import Embeddings
+from langchain.schema.vectorstore import VST, VectorStore
+
+from janus.converter.diagram import DiagramGenerator
+from janus.converter.requirements import RequirementsDocumenter
+from janus.converter.translate import Translator
+from janus.language.block import CodeBlock, TranslatedCodeBlock
+
+
+class MockCollection(VectorStore):
+    """Vector store for testing"""
+
+    def __init__(self):
+        self._add_texts_calls = 0
+
+    def add_texts(
+        self, texts: Iterable[str], metadatas: Optional[List[dict]] = None, **kwargs: Any
+    ) -> List[str]:
+        self._add_texts_calls += 1
+        return ["id"]
+
+    def similarity_search(self, query: str, k: int = 4, **kwargs: Any) -> List[Document]:
+        raise NotImplementedError("similarity_search() not implemented!")
+
+    @classmethod
+    def from_texts(
+        cls: Type[VST],
+        texts: List[str],
+        embedding: Embeddings,
+        metadatas: Optional[List[dict]] = None,
+        **kwargs: Any,
+    ) -> VST:
+        raise NotImplementedError("from_texts() not implemented!")
+
+
+class TestTranslator(unittest.TestCase):
+    """Tests for the Translator class."""
+
+    def setUp(self):
+        """Set up the tests."""
+        self.translator = Translator(
+            model="gpt-4o-mini",
+            source_language="fortran",
+            target_language="python",
+            target_version="3.10",
+            splitter_type="ast-flex",
+        )
+        self.test_file = Path("janus/language/treesitter/_tests/languages/fortran.f90")
+        self.TEST_FILE_EMBEDDING_COUNT = 14
+
+        self.req_translator = RequirementsDocumenter(
+            model="gpt-4o-mini",
+            source_language="fortran",
+            prompt_template="requirements",
+        )
+
+    @pytest.mark.translate
+    def test_translate(self):
+        """Test translate method."""
+        # Delete a file if it's already there
+        python_file = self.test_file.parent / "python" / f"{self.test_file.stem}.py"
+        python_file.unlink(missing_ok=True)
+        python_file.parent.rmdir() if python_file.parent.is_dir() else None
+        self.translator.translate(self.test_file.parent, self.test_file.parent / "python")
+        # Only check the top-most level functionality, since it should be handled by other
+        # unit tests anyway
+        self.assertTrue(python_file.exists())
+
+    def test_invalid_selections(self) -> None:
+        """Tests that settings values for the translator will raise exceptions"""
+        self.assertRaises(
+            ValueError, self.translator.set_target_language, "gobbledy", "goobledy"
+        )
+        self.assertRaises(
+            ValueError, self.translator.set_source_language, "scribbledy-doop"
+        )
+        self.translator.set_prompt("pish posh")
+        self.assertRaises(ValueError, self.translator._load_parameters)
+
+
+class TestDiagramGenerator(unittest.TestCase):
+    """Tests for the DiagramGenerator class."""
+
+    def setUp(self):
+        """Set up the tests."""
+        self.diagram_generator = DiagramGenerator(
+            model="gpt-4o",
+            source_language="fortran",
+            diagram_type="Activity",
+        )
+
+    def test_init(self):
+        """Test __init__ method."""
+        self.assertEqual(self.diagram_generator._model_name, "gpt-4o")
+        self.assertEqual(self.diagram_generator._source_language, "fortran")
+        self.assertEqual(self.diagram_generator._diagram_type, "Activity")
+
+    def test_add_translation(self):
+        """Test _add_translation method."""
+        block = TranslatedCodeBlock(
+            original=CodeBlock(
+                id="test",
+                name="Test Block",
+                node_type="function",
+                language="python",
+                text="print('Hello, World!')",
+                start_point=(0, 0),
+                end_point=(1, 0),
+                start_byte=0,
+                end_byte=1,
+                tokens=5,
+                children=[],
+            ),
+            language="python",
+        )
+        self.diagram_generator._add_translation(block)
+        self.assertTrue(block.translated)
+        self.assertIsNotNone(block.text)
+        self.assertIsNotNone(block.tokens)
+
+
+@pytest.mark.parametrize(
+    "source_language,prompt_template,expected_target_language,expected_target_version,",
+    [
+        ("python", "document_inline", "python", "3.10"),
+        ("fortran", "document", "text", None),
+        ("mumps", "requirements", "text", None),
+        ("python", "simple", "javascript", "es6"),
+    ],
+)
+def test_language_combinations(
+    source_language: str,
+    prompt_template: str,
+    expected_target_language: str,
+    expected_target_version: str,
+):
+    """Tests that translator target language settings are consistent
+    with prompt template expectations.
+    """
+    translator = Translator(model="gpt-4o")
+    translator.set_model("gpt-4o")
+    translator.set_source_language(source_language)
+    translator.set_target_language(expected_target_language, expected_target_version)
+    translator.set_prompt(prompt_template)
+    translator._load_parameters()
+    assert translator._target_language == expected_target_language  # nosec
+    assert translator._target_version == expected_target_version  # nosec
+    assert translator._splitter.language == source_language  # nosec
+    assert translator._splitter.model.model_name == "gpt-4o"  # nosec
+    assert translator._prompt_template_name == prompt_template  # nosec

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/converter/converter.py

@@ -6,7 +6,6 @@ from pathlib import Path
 from typing import Any
 
 from langchain.output_parsers import RetryWithErrorOutputParser
-from langchain.output_parsers.fix import OutputFixingParser
 from langchain_core.exceptions import OutputParserException
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.output_parsers import BaseOutputParser
@@ -29,6 +28,8 @@ from janus.llm import load_model
 from janus.llm.model_callbacks import get_model_callback
 from janus.llm.models_info import MODEL_PROMPT_ENGINES
 from janus.parsers.code_parser import GenericParser
+from janus.parsers.refiner_parser import RefinerParser
+from janus.refiners.refiner import BasicRefiner, Refiner
 from janus.utils.enums import LANGUAGES
 from janus.utils.logger import create_logger
 
@@ -75,6 +76,7 @@ class Converter:
         protected_node_types: tuple[str, ...] = (),
         prune_node_types: tuple[str, ...] = (),
         splitter_type: str = "file",
+        refiner_type: str = "basic",
     ) -> None:
         """Initialize a Converter instance.
 
@@ -84,6 +86,17 @@ class Converter:
                 values are `"code"`, `"text"`, `"eval"`, and `None` (default). If `None`,
                 the `Converter` assumes you won't be parsing an output (i.e., adding to an
                 embedding DB).
+            max_prompts: The maximum number of prompts to try before giving up.
+            max_tokens: The maximum number of tokens to use in the LLM. If `None`, the
+                converter will use half the model's token limit.
+            prompt_template: The name of the prompt template to use.
+            db_path: The path to the database to use for vectorization.
+            db_config: The configuration for the database.
+            protected_node_types: A set of node types that aren't to be merged.
+            prune_node_types: A set of node types which should be pruned.
+            splitter_type: The type of splitter to use. Valid values are `"file"`,
+                `"tag"`, `"chunk"`, `"ast-strict"`, and `"ast-flex"`.
+            refiner_type: The type of refiner to use. Valid values are `"basic"`.
         """
         self._changed_attrs: set = set()
 
@@ -116,7 +129,11 @@ class Converter:
         self._parser: BaseOutputParser = GenericParser()
         self._combiner: Combiner = Combiner()
 
+        self._refiner_type: str
+        self._refiner: Refiner
+
         self.set_splitter(splitter_type=splitter_type)
+        self.set_refiner(refiner_type=refiner_type)
         self.set_model(model_name=model, **model_arguments)
         self.set_prompt(prompt_template=prompt_template)
         self.set_source_language(source_language)
@@ -142,6 +159,7 @@ class Converter:
         self._load_prompt()
         self._load_splitter()
         self._load_vectorizer()
+        self._load_refiner()
         self._changed_attrs.clear()
 
     def set_model(self, model_name: str, **custom_arguments: dict[str, Any]):
@@ -179,6 +197,16 @@ class Converter:
         """
         self._splitter_type = splitter_type
 
+    def set_refiner(self, refiner_type: str) -> None:
+        """Validate and set the refiner name
+
+        The affected objects will not be updated until translate is called
+
+        Arguments:
+            refiner_type: the name of the refiner to use
+        """
+        self._refiner_type = refiner_type
+
     def set_source_language(self, source_language: str) -> None:
         """Validate and set the source language.
 
@@ -249,10 +277,24 @@ class Converter:
         )
 
         if self._splitter_type == "tag":
-            kwargs["tag"] = "<ITMOD_ALC_SPLIT>"
+            kwargs["tag"] = "<ITMOD_ALC_SPLIT>"  # Hardcoded for now
 
         self._splitter = CUSTOM_SPLITTERS[self._splitter_type](**kwargs)
 
+    @run_if_changed("_refiner_type", "_model_name")
+    def _load_refiner(self) -> None:
+        """Load the refiner according to this instance's attributes.
+
+        If the relevant fields have not been changed since the last time this method was
+        called, nothing happens.
+        """
+        if self._refiner_type == "basic":
+            self._refiner = BasicRefiner(
+                "basic_refinement", self._model_name, self._source_language
+            )
+        else:
+            raise ValueError(f"Error: unknown refiner type {self._refiner_type}")
+
     @run_if_changed("_model_name", "_custom_model_arguments")
     def _load_model(self) -> None:
         """Load the model according to this instance's attributes.
@@ -561,22 +603,22 @@ class Converter:
         # Retries with just the input
         n3 = math.ceil(self.max_prompts / (n1 * n2))
 
-        fix_format = OutputFixingParser.from_llm(
-            llm=self._llm,
+        refine_output = RefinerParser(
             parser=self._parser,
+            initial_prompt=self._prompt.format(**{"SOURCE_CODE": block.original.text}),
+            refiner=self._refiner,
             max_retries=n1,
+            llm=self._llm,
         )
         retry = RetryWithErrorOutputParser.from_llm(
             llm=self._llm,
-            parser=fix_format,
+            parser=refine_output,
             max_retries=n2,
         )
-
         completion_chain = self._prompt | self._llm
         chain = RunnableParallel(
             completion=completion_chain, prompt_value=self._prompt
         ) | RunnableLambda(lambda x: retry.parse_with_prompt(**x))
-
         for _ in range(n3):
             try:
                 return chain.invoke({"SOURCE_CODE": block.original.text})

janus_llm-3.3.0/janus/converter/diagram.py

@@ -0,0 +1,139 @@
+import math
+
+from langchain.output_parsers import RetryWithErrorOutputParser
+from langchain_core.exceptions import OutputParserException
+from langchain_core.runnables import RunnableLambda, RunnableParallel
+
+from janus.converter.converter import run_if_changed
+from janus.converter.document import Documenter
+from janus.language.block import TranslatedCodeBlock
+from janus.llm.models_info import MODEL_PROMPT_ENGINES
+from janus.parsers.refiner_parser import RefinerParser
+from janus.parsers.uml import UMLSyntaxParser
+from janus.utils.logger import create_logger
+
+log = create_logger(__name__)
+
+
+class DiagramGenerator(Documenter):
+    """DiagramGenerator
+
+    A class that translates code from one programming language to a set of diagrams.
+    """
+
+    def __init__(
+        self,
+        diagram_type="Activity",
+        add_documentation=False,
+        **kwargs,
+    ) -> None:
+        """Initialize the DiagramGenerator class
+
+        Arguments:
+            model: The LLM to use for translation. If an OpenAI model, the
+                `OPENAI_API_KEY` environment variable must be set and the
+                `OPENAI_ORG_ID` environment variable should be set if needed.
+            model_arguments: Additional arguments to pass to the LLM constructor.
+            source_language: The source programming language.
+            max_prompts: The maximum number of prompts to try before giving up.
+            db_path: path to chroma database
+            db_config: database configuraiton
+            diagram_type: type of PLANTUML diagram to generate
+        """
+        super().__init__(**kwargs)
+        self._diagram_type = diagram_type
+        self._add_documentation = add_documentation
+        self._documenter = None
+        self._diagram_parser = UMLSyntaxParser(language="plantuml")
+        if add_documentation:
+            self._diagram_prompt_template_name = "diagram_with_documentation"
+        else:
+            self._diagram_prompt_template_name = "diagram"
+        self._load_diagram_prompt_engine()
+
+    def _run_chain(self, block: TranslatedCodeBlock) -> str:
+        self._parser.set_reference(block.original)
+        n1 = round(self.max_prompts ** (1 / 3))
+
+        # Retries with the input, output, and error
+        n2 = round((self.max_prompts // n1) ** (1 / 2))
+
+        # Retries with just the input
+        n3 = math.ceil(self.max_prompts / (n1 * n2))
+
+        if self._add_documentation:
+            documentation_text = super()._run_chain(block)
+            refine_output = RefinerParser(
+                parser=self._diagram_parser,
+                initial_prompt=self._diagram_prompt.format(
+                    **{
+                        "SOURCE_CODE": block.original.text,
+                        "DOCUMENTATION": documentation_text,
+                        "DIAGRAM_TYPE": self._diagram_type,
+                    }
+                ),
+                refiner=self._refiner,
+                max_retries=n1,
+                llm=self._llm,
+            )
+        else:
+            refine_output = RefinerParser(
+                parser=self._diagram_parser,
+                initial_prompt=self._diagram_prompt.format(
+                    **{
+                        "SOURCE_CODE": block.original.text,
+                        "DIAGRAM_TYPE": self._diagram_type,
+                    }
+                ),
+                refiner=self._refiner,
+                max_retries=n1,
+                llm=self._llm,
+            )
+        retry = RetryWithErrorOutputParser.from_llm(
+            llm=self._llm,
+            parser=refine_output,
+            max_retries=n2,
+        )
+        completion_chain = self._prompt | self._llm
+        chain = RunnableParallel(
+            completion=completion_chain, prompt_value=self._diagram_prompt
+        ) | RunnableLambda(lambda x: retry.parse_with_prompt(**x))
+        for _ in range(n3):
+            try:
+                if self._add_documentation:
+                    return chain.invoke(
+                        {
+                            "SOURCE_CODE": block.original.text,
+                            "DOCUMENTATION": documentation_text,
+                            "DIAGRAM_TYPE": self._diagram_type,
+                        }
+                    )
+                else:
+                    return chain.invoke(
+                        {
+                            "SOURCE_CODE": block.original.text,
+                            "DIAGRAM_TYPE": self._diagram_type,
+                        }
+                    )
+            except OutputParserException:
+                pass
+
+        raise OutputParserException(f"Failed to parse after {n1*n2*n3} retries")
+
+    @run_if_changed(
+        "_diagram_prompt_template_name",
+        "_source_language",
+    )
+    def _load_diagram_prompt_engine(self) -> None:
+        """Load the prompt engine according to this instance's attributes.
+
+        If the relevant fields have not been changed since the last time this method was
+        called, nothing happens.
+        """
+        self._diagram_prompt_engine = MODEL_PROMPT_ENGINES[self._model_name](
+            source_language=self._source_language,
+            target_language="text",
+            target_version=None,
+            prompt_template=self._diagram_prompt_template_name,
+        )
+        self._diagram_prompt = self._diagram_prompt_engine.prompt

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/_tests/test_collections.py

@@ -4,8 +4,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from ...utils.enums import EmbeddingType
-from ..collections import Collections
+from janus.embedding.collections import Collections
+from janus.utils.enums import EmbeddingType
 
 
 class TestCollections(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/_tests/test_database.py

@@ -2,7 +2,7 @@ import unittest
 from pathlib import Path
 from unittest.mock import patch
 
-from ..database import ChromaEmbeddingDatabase, uri_to_path
+from janus.embedding.database import ChromaEmbeddingDatabase, uri_to_path
 
 
 class TestDatabase(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/_tests/test_vectorize.py

@@ -5,9 +5,9 @@ from unittest.mock import MagicMock
 
 from chromadb.api.client import Client
 
-from ...language.treesitter import TreeSitterSplitter
-from ...utils.enums import EmbeddingType
-from ..vectorize import Vectorizer, VectorizerFactory
+from janus.embedding.vectorize import Vectorizer, VectorizerFactory
+from janus.language.treesitter import TreeSitterSplitter
+from janus.utils.enums import EmbeddingType
 
 
 class MockDBVectorizer(VectorizerFactory):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/collections.py

@@ -5,8 +5,8 @@ from typing import Dict, Optional, Sequence
 from chromadb import Client, Collection
 from langchain_community.vectorstores import Chroma
 
-from ..utils.enums import EmbeddingType
-from .embedding_models_info import load_embedding_model
+from janus.embedding.embedding_models_info import load_embedding_model
+from janus.utils.enums import EmbeddingType
 
 # See https://docs.trychroma.com/telemetry#in-chromas-backend-using-environment-variables
 os.environ["ANONYMIZED_TELEMETRY"] = "False"

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/database.py

@@ -5,7 +5,7 @@ from urllib.request import url2pathname
 
 import chromadb
 
-from ..utils.logger import create_logger
+from janus.utils.logger import create_logger
 
 log = create_logger(__name__)
 

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/embedding_models_info.py

@@ -8,7 +8,7 @@ from langchain_community.embeddings.huggingface import HuggingFaceInferenceAPIEm
 from langchain_core.embeddings import Embeddings
 from langchain_openai import OpenAIEmbeddings
 
-from ..utils.logger import create_logger
+from janus.utils.logger import create_logger
 
 load_dotenv()
 

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/embedding/vectorize.py

@@ -6,10 +6,10 @@ from typing import Any, Dict, Optional, Sequence
 from chromadb import Client, Collection
 from langchain_community.vectorstores import Chroma
 
-from ..language.block import CodeBlock, TranslatedCodeBlock
-from ..utils.enums import EmbeddingType
-from .collections import Collections
-from .database import ChromaEmbeddingDatabase
+from janus.embedding.collections import Collections
+from janus.embedding.database import ChromaEmbeddingDatabase
+from janus.language.block import CodeBlock, TranslatedCodeBlock
+from janus.utils.enums import EmbeddingType
 
 
 class Vectorizer(object):
@@ -59,7 +59,7 @@ class Vectorizer(object):
         self,
         code_block: CodeBlock,
         collection_name: EmbeddingType | str,
-        filename: str  # perhaps this should be a relative path from the source, but for
+        filename: str,  # perhaps this should be a relative path from the source, but for
         # now we're all in 1 directory
     ) -> None:
         """Calculate `code_block` embedding, returning success & storing in `embedding_id`

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/_tests/test_combine.py

@@ -1,6 +1,6 @@
 import unittest
 
-from ..combine import CodeBlock, Combiner, TranslatedCodeBlock
+from janus.language.combine import CodeBlock, Combiner, TranslatedCodeBlock
 
 
 class TestCombiner(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/_tests/test_splitter.py

@@ -1,6 +1,6 @@
 import unittest
 
-from ..splitter import Splitter
+from janus.language.splitter import Splitter
 
 
 class TestSplitter(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/alc/_tests/test_alc.py

@@ -1,9 +1,9 @@
 import unittest
 from pathlib import Path
 
-from ....llm import load_model
-from ...combine import Combiner
-from ..alc import AlcSplitter
+from janus.language.alc import AlcSplitter
+from janus.language.combine import Combiner
+from janus.llm import load_model
 
 
 class TestAlcSplitter(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/alc/alc.py

@@ -1,10 +1,10 @@
 from langchain.schema.language_model import BaseLanguageModel
 
-from ...utils.logger import create_logger
-from ..block import CodeBlock
-from ..combine import Combiner
-from ..node import NodeType
-from ..treesitter import TreeSitterSplitter
+from janus.language.block import CodeBlock
+from janus.language.combine import Combiner
+from janus.language.node import NodeType
+from janus.language.treesitter import TreeSitterSplitter
+from janus.utils.logger import create_logger
 
 log = create_logger(__name__)
 

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/binary/_tests/test_binary.py

@@ -5,8 +5,8 @@ from unittest.mock import patch
 
 import pytest
 
-from ....llm import load_model
-from ..binary import BinarySplitter
+from janus.language.binary import BinarySplitter
+from janus.llm import load_model
 
 
 class TestBinarySplitter(unittest.TestCase):

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/binary/binary.py

@@ -7,11 +7,11 @@ from pathlib import Path
 import tree_sitter
 from langchain.schema.language_model import BaseLanguageModel
 
-from ...utils.enums import LANGUAGES
-from ...utils.logger import create_logger
-from ..block import CodeBlock
-from ..combine import Combiner
-from ..treesitter import TreeSitterSplitter
+from janus.language.block import CodeBlock
+from janus.language.combine import Combiner
+from janus.language.treesitter import TreeSitterSplitter
+from janus.utils.enums import LANGUAGES
+from janus.utils.logger import create_logger
 
 log = create_logger(__name__)
 

{janus_llm-3.2.0 → janus_llm-3.3.0}/janus/language/block.py

@@ -1,8 +1,8 @@
 from functools import total_ordering
 from typing import ForwardRef, Hashable, Optional, Tuple
 
-from ..utils.logger import create_logger
-from .node import NodeType
+from janus.language.node import NodeType
+from janus.utils.logger import create_logger
 
 log = create_logger(__name__)