janus-llm 3.5.0__py3-none-any.whl → 3.5.2__py3-none-any.whl

janus/__init__.py

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

janus/_tests/test_cli.py

@@ -120,6 +120,7 @@ class TestCli(unittest.TestCase):
             temp=0.7,
             prompt_template="simple",
             collection=None,
+            llm_name="gpt-4o",
         )
 
         # Assert

janus/cli.py

@@ -185,7 +185,7 @@ def translate(
             "-L",
             help="The custom name of the model set with 'janus llm add'.",
         ),
-    ] = "gpt-4o",
+    ],
     max_prompts: Annotated[
         int,
         typer.Option(
@@ -324,7 +324,7 @@ def document(
             "-L",
             help="The custom name of the model set with 'janus llm add'.",
         ),
-    ] = "gpt-4o",
+    ],
     max_prompts: Annotated[
         int,
         typer.Option(
@@ -480,7 +480,7 @@ def aggregate(
             "-L",
             help="The custom name of the model set with 'janus llm add'.",
         ),
-    ] = "gpt-4o",
+    ],
     max_prompts: Annotated[
         int,
         typer.Option(
@@ -597,7 +597,7 @@ def diagram(
             "-L",
             help="The custom name of the model set with 'janus llm add'.",
         ),
-    ] = "gpt-4o",
+    ],
     max_prompts: Annotated[
         int,
         typer.Option(

janus/converter/diagram.py

@@ -130,7 +130,7 @@ class DiagramGenerator(Documenter):
         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](
+        self._diagram_prompt_engine = MODEL_PROMPT_ENGINES[self._model_id](
             source_language=self._source_language,
             target_language="text",
             target_version=None,

janus/converter/document.py

@@ -125,7 +125,7 @@ class MadLibsDocumenter(Documenter):
             out_text = self._parser.parse(working_block.text)
             obj.update(json.loads(out_text))
 
-        self._parser.set_reference(block.original)
+        self._parser.parse_input(block.original)
         block.text = self._parser.parse(json.dumps(obj))
         block.tokens = self._llm.get_num_tokens(block.text)
         block.translated = True

janus/parsers/doc_parser.py

@@ -92,11 +92,12 @@ class MadlibsDocumentationParser(JanusParser):
     def __init__(self):
         super().__init__(expected_keys=[])
 
-    def parse_input(self, block: CodeBlock):
+    def parse_input(self, block: CodeBlock) -> str:
         # TODO: Perform comment stripping/placeholding here rather than in script
         text = super().parse_input(block)
         comment_ids = re.findall(r"<(?:BLOCK|INLINE)_COMMENT (\w{8})>", text)
         self.expected_keys = set(comment_ids)
+        return text
 
     def parse(self, text: str | BaseMessage) -> str:
         if isinstance(text, BaseMessage):

{janus_llm-3.5.0.dist-info → janus_llm-3.5.2.dist-info}/METADATA

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

{janus_llm-3.5.0.dist-info → janus_llm-3.5.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
-janus/__init__.py,sha256=ceM2MUGzMNJff2fc8X9U3f-ROSo5J9aDJiQDRj_aVNk,361
+janus/__init__.py,sha256=tHgbaw6giBzOW8xhZzmG-PUD72eGrW0P-NRuSYCGoSY,361
 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
-janus/_tests/test_cli.py,sha256=oYJsUGWfpBJWEGRG5NGxdJedU5DU_m6fwJ7xEbJVYl0,4244
-janus/cli.py,sha256=84deHkbRWxT2ThHa9b08HBIIThy-mw1b5WCfjWOcuME,36950
+janus/_tests/test_cli.py,sha256=6ef7h11bg4i7Q6L1-r0ZdcY7YrH4n472kvDiA03T4c8,4275
+janus/cli.py,sha256=zsvS6XxwOxiDexeMQhM6sj0vR4D9uomNCZGk6yMIaFQ,36906
 janus/converter/__init__.py,sha256=U2EOMcCykiC0ZqhorNefOP_04hOF18qhYoPKrVp1Vrk,345
 janus/converter/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/converter/_tests/test_translate.py,sha256=yzcFEGc_z8QmBBBmC9dZnfL9tT8CD1rkpc8Hz44Jp4c,5631
 janus/converter/aggregator.py,sha256=MuAXMKmq6PuUo_w6ljyiuDn81Gk2dN-Ci7FVeLc6vhs,1966
 janus/converter/converter.py,sha256=GL4moCOi5vvvsEjAf_7Vrn5GHq12nptH47AAP4soeQc,27956
-janus/converter/diagram.py,sha256=AyxkoyfMoQ7jpuOqyJ3bIvYqHJSEhmR-gYrIsq-d8tk,5285
-janus/converter/document.py,sha256=hsW512veNjFWbdl5WriuUdNmMEqZy8ktRvqn9rRmA6E,4566
+janus/converter/diagram.py,sha256=sqztG_8T_gQ4njk5V7tg1QCgT6gFbL3CUy7t2l0X5i4,5283
+janus/converter/document.py,sha256=qNt2UncMheUBadXCFHGq74tqCrvZub5DCgZpd3Qa54o,4564
 janus/converter/evaluate.py,sha256=APWQUY3gjAXqkJkPzvj0UA4wPK3Cv9QSJLM-YK9t-ng,476
 janus/converter/requirements.py,sha256=9tvQ40FZJtG8niIFn45gPQCgKKHVPPoFLinBv6RAqO4,2027
 janus/converter/translate.py,sha256=0brQTlSfBYmXtoM8QYIOiyr0LrTr0S1n68Du-BR7_WQ,4236
@@ -86,7 +86,7 @@ janus/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/parsers/_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janus/parsers/_tests/test_code_parser.py,sha256=3ay5QpUPcynX_EJ-YLl3PR28poutUkT7qvyWUSQ7Too,928
 janus/parsers/code_parser.py,sha256=3l0HfzgrvJuiwk779s9ZsgUl3xbp1nE1qZxh8aDYRBI,873
-janus/parsers/doc_parser.py,sha256=G7kDdJ3davHhEFXqwNYw7hOB26hKH_d_0XdpyyBHq_U,5835
+janus/parsers/doc_parser.py,sha256=0pUsNZ9hKQLjIi8L8BgkOBHQZ_EGoFLHrBQ4hoDkjSw,5862
 janus/parsers/eval_parser.py,sha256=Gjh6aTZgpYd2ASJUEPMo4LpCL00cBmbOqc4KM3hy8x8,2922
 janus/parsers/parser.py,sha256=y6VV64bgVidf-oEFla3I--_28tnJsPBc6QUD_SkbfSE,1614
 janus/parsers/refiner_parser.py,sha256=W7ecDX7j6N-uWtRBYFD1EiEzDpDQws16nrVFzyArzf8,1632
@@ -102,8 +102,8 @@ janus/utils/_tests/test_progress.py,sha256=Rs_u5PiGjP-L-o6C1fhwfE1ig8jYu9Xo9s4p8
 janus/utils/enums.py,sha256=AoilbdiYyMvY2Mp0AM4xlbLSELfut2XMwhIM1S_msP4,27610
 janus/utils/logger.py,sha256=KZeuaMAnlSZCsj4yL0P6N-JzZwpxXygzACWfdZFeuek,2337
 janus/utils/progress.py,sha256=PIpcQec7SrhsfqB25LHj2CDDkfm9umZx90d9LZnAx6k,1469
-janus_llm-3.5.0.dist-info/LICENSE,sha256=_j0st0a-HB6MRbP3_BW3PUqpS16v54luyy-1zVyl8NU,10789
-janus_llm-3.5.0.dist-info/METADATA,sha256=hFVUIcLuovJkZQDub9NYjzqnxWa8lzBTtsXODYI449o,4184
-janus_llm-3.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-janus_llm-3.5.0.dist-info/entry_points.txt,sha256=OGhQwzj6pvXp79B0SaBD5apGekCu7Dwe9fZZT_TZ544,39
-janus_llm-3.5.0.dist-info/RECORD,,
+janus_llm-3.5.2.dist-info/LICENSE,sha256=_j0st0a-HB6MRbP3_BW3PUqpS16v54luyy-1zVyl8NU,10789
+janus_llm-3.5.2.dist-info/METADATA,sha256=Fa-HOr0_a3LvNwGGcjMCTqV2v1roMCInPU2zXZkl298,4184
+janus_llm-3.5.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+janus_llm-3.5.2.dist-info/entry_points.txt,sha256=OGhQwzj6pvXp79B0SaBD5apGekCu7Dwe9fZZT_TZ544,39
+janus_llm-3.5.2.dist-info/RECORD,,