janus-llm 3.0.1__py3-none-any.whl → 3.1.1__py3-none-any.whl

janus/__init__.py

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

janus/converter/diagram.py

@@ -5,6 +5,7 @@ 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.uml import UMLSyntaxParser
 from janus.utils.logger import create_logger
 
 log = create_logger(__name__)
@@ -39,6 +40,7 @@ class DiagramGenerator(Documenter):
         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:
@@ -83,7 +85,7 @@ class DiagramGenerator(Documenter):
 
         self._parser.set_reference(block.original)
 
-        query_and_parse = self.diagram_prompt | self._llm | self._parser
+        query_and_parse = self.diagram_prompt | self._llm | self._diagram_parser
 
         if self._add_documentation:
             block.text = query_and_parse.invoke(

janus/parsers/uml.py

@@ -0,0 +1,51 @@
+import re
+import subprocess  # nosec
+from pathlib import Path
+from typing import List, Tuple
+
+from langchain_core.exceptions import OutputParserException
+
+from janus.utils.logger import create_logger
+
+from .code_parser import CodeParser
+
+log = create_logger(__name__)
+
+
+class UMLSyntaxParser(CodeParser):
+    def _get_uml_output(self, file: str) -> Tuple[str, str]:
+        # NOTE: running subprocess with shell=False, added nosec to label that we know
+        # risk exists
+        try:
+            plantuml_path = Path.home().expanduser() / ".janus/lib/plantuml.jar"
+            res = subprocess.run(
+                ["java", "-jar", plantuml_path, file],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )  # nosec
+            stdout = res.stdout.decode("utf-8")
+            stderr = res.stderr.decode("utf-8")
+        except FileNotFoundError:
+            log.warning("Plant UML executable not found, skipping syntax check")
+            stdout = ""
+            stderr = ""
+        return stdout, stderr
+
+    def _get_errs(self, s: str) -> List[str]:
+        return [x.group() for x in re.finditer(r"Error (.*)\n", s)]
+
+    def parse(self, text: str) -> str:
+        text = super().parse(text)
+        janus_path = Path.home().expanduser() / Path(".janus")
+        if not janus_path.exists():
+            janus_path.mkdir()
+        temp_file_path = janus_path / "tmp.txt"
+        with open(temp_file_path, "w") as f:
+            f.write(text)
+        uml_std_out, uml_std_err = self._get_uml_output(temp_file_path)
+        uml_errs = self._get_errs(uml_std_out) + self._get_errs(uml_std_err)
+        if len(uml_errs) > 0:
+            raise OutputParserException(
+                "Error: Received UML Errors:\n" + "\n".join(uml_errs)
+            )
+        return text

{janus_llm-3.0.1.dist-info → janus_llm-3.1.1.dist-info}/METADATA

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

{janus_llm-3.0.1.dist-info → janus_llm-3.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-janus/__init__.py,sha256=OkY9msOgEgU_jai5YdGjfv6hQG6UopI7S2J_M9EKs-U,351
+janus/__init__.py,sha256=jQAeQ79XxAr006t0p-cWwyFpS-zXKlBPpr_Ock6OrPw,351
 janus/__main__.py,sha256=lEkpNtLVPtFo8ySDZeXJ_NXDHb0GVdZFPWB4gD4RPS8,64
 janus/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/_tests/conftest.py,sha256=V7uW-oq3YbFiRPvrq15YoVVrA1n_83pjgiyTZ-IUGW8,963
@@ -8,7 +8,7 @@ janus/converter/__init__.py,sha256=kzVmWOPXRDayqqBZ8ZDaFQzA_q8PEdv407dc-DefPxY,2
 janus/converter/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/converter/_tests/test_translate.py,sha256=eiLbmouokZrAeAYmdoJgnlx5-k4QiO6i0N6e6ZvZsvM,15885
 janus/converter/converter.py,sha256=Bq07_9N_3Dv9NBqVACvb7LC2HxdQmfVZ1b0BlWrxjgo,23521
-janus/converter/diagram.py,sha256=v-3ZZ4t1q74lDOjF2N6NRPkC3IK-sjLDn5_VChZTEGA,4608
+janus/converter/diagram.py,sha256=JsJNDf-P8bPejpDxbCVEHvw-0kewiMrXh5qLhsL5JOA,4730
 janus/converter/document.py,sha256=hsW512veNjFWbdl5WriuUdNmMEqZy8ktRvqn9rRmA6E,4566
 janus/converter/evaluate.py,sha256=APWQUY3gjAXqkJkPzvj0UA4wPK3Cv9QSJLM-YK9t-ng,476
 janus/converter/requirements.py,sha256=6YvrJRVH9BuPCOPxnXmaJQFYmoLYYvCu3zTntDLHeNg,1832
@@ -88,6 +88,7 @@ janus/parsers/code_parser.py,sha256=XwCoOYwnx2tpqluIdXWg-GWOOkooSDYmJHvqDrxgf48,
 janus/parsers/doc_parser.py,sha256=X8eCb1QXbL6sVWLEFGjsPyxrpJ9XnOPg7G4KZSo9A9E,5658
 janus/parsers/eval_parser.py,sha256=HB5-zY_Jpmkj6FDbuNCCVCRxwmzhViSAjPKbyyC0Ebc,2723
 janus/parsers/reqs_parser.py,sha256=MFBvtR3otpyPZlkZxu0dVH1YeEJhvhNzhaGKGHaQVHA,2359
+janus/parsers/uml.py,sha256=Zb_Yl5NZKYZo8WDNH5TFpaGtI35JR4vJQTVNBH2q6lo,1813
 janus/prompts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/prompts/prompt.py,sha256=vd7UbitF0VFCi21RsggDebD51xcuyls_lQLGKkphfI8,10578
 janus/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -97,8 +98,8 @@ janus/utils/_tests/test_progress.py,sha256=Yh5NDNq-24n2nhHHbJm39pENAH70PYnh9ymwd
 janus/utils/enums.py,sha256=AoilbdiYyMvY2Mp0AM4xlbLSELfut2XMwhIM1S_msP4,27610
 janus/utils/logger.py,sha256=KZeuaMAnlSZCsj4yL0P6N-JzZwpxXygzACWfdZFeuek,2337
 janus/utils/progress.py,sha256=pKcCzO9JOU9fSD7qTmLWcqY5smc8mujqQMXoPgqNysE,1458
-janus_llm-3.0.1.dist-info/LICENSE,sha256=_j0st0a-HB6MRbP3_BW3PUqpS16v54luyy-1zVyl8NU,10789
-janus_llm-3.0.1.dist-info/METADATA,sha256=tVkX6eswouFez-ASfy-iWJk_iXptEeylGETEZF4MeeI,4184
-janus_llm-3.0.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-janus_llm-3.0.1.dist-info/entry_points.txt,sha256=OGhQwzj6pvXp79B0SaBD5apGekCu7Dwe9fZZT_TZ544,39
-janus_llm-3.0.1.dist-info/RECORD,,
+janus_llm-3.1.1.dist-info/LICENSE,sha256=_j0st0a-HB6MRbP3_BW3PUqpS16v54luyy-1zVyl8NU,10789
+janus_llm-3.1.1.dist-info/METADATA,sha256=1ctKwnb7R2X0yHkH6lY54iYX3dcSU6cy4mVBtvO_6bE,4184
+janus_llm-3.1.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+janus_llm-3.1.1.dist-info/entry_points.txt,sha256=OGhQwzj6pvXp79B0SaBD5apGekCu7Dwe9fZZT_TZ544,39
+janus_llm-3.1.1.dist-info/RECORD,,