janus-llm 4.3.1__py3-none-any.whl → 4.3.5__py3-none-any.whl

janus/converter/evaluate.py

@@ -9,6 +9,7 @@ from janus.language.block import TranslatedCodeBlock
 from janus.language.combine import JsonCombiner
 from janus.parsers.eval_parsers.incose_parser import IncoseParser
 from janus.parsers.eval_parsers.inline_comment_parser import InlineCommentParser
+from janus.parsers.parser import JanusParserException
 from janus.utils.logger import create_logger
 
 log = create_logger(__name__)
@@ -30,8 +31,7 @@ class Evaluator(Converter):
 
         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.
+                `OPENAI_API_KEY` environment variable must be set.
             model_arguments: Additional arguments to pass to the LLM constructor.
             max_prompts: The maximum number of prompts to try before giving up.
         """
@@ -55,8 +55,7 @@ class RequirementEvaluator(Evaluator):
 
         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.
+                `OPENAI_API_KEY` environment variable must be set.
             model_arguments: Additional arguments to pass to the LLM constructor.
             max_prompts: The maximum number of prompts to try before giving up.
         """
@@ -110,7 +109,6 @@ class RequirementEvaluator(Evaluator):
 
         block.processing_time = 0
         block.cost = 0
-        block.retries = 0
         obj = {}
         for i in range(0, len(requirements), self.eval_items_per_request):
             # Build a new TranslatedBlock using the new working text
@@ -122,15 +120,25 @@ class RequirementEvaluator(Evaluator):
             working_block = TranslatedCodeBlock(working_copy, self._target_language)
 
             # Run the LLM on the working text
-            super()._add_translation(working_block)
-
-            # Update metadata to include for all runs
-            block.retries += working_block.retries
-            block.cost += working_block.cost
-            block.processing_time += working_block.processing_time
+            try:
+                super()._add_translation(working_block)
+            except JanusParserException as e:
+                block.text += "\n==============\n" + working_block.text
+                block.tokens = self._llm.get_num_tokens(block.text)
+                raise e
+            finally:
+                # Update metadata to include for all runs
+                block.num_requests += working_block.num_requests
+                block.cost += working_block.cost
+                block.processing_time += working_block.processing_time
+                block.request_input_tokens += working_block.request_input_tokens
+                block.request_output_tokens += working_block.request_output_tokens
 
             # Update the output text to merge this section's output in
             obj.update(json.loads(working_block.text))
+            # intermediate result of block,
+            # will be overwritten if file completes successfully
+            block.text = json.dumps(obj)
 
         block.text = json.dumps(obj)
         block.tokens = self._llm.get_num_tokens(block.text)
@@ -153,8 +161,7 @@ class InlineCommentEvaluator(Evaluator):
 
         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.
+                `OPENAI_API_KEY` environment variable must be set.
             model_arguments: Additional arguments to pass to the LLM constructor.
             max_prompts: The maximum number of prompts to try before giving up.
         """

janus/converter/translate.py

@@ -21,8 +21,7 @@ class Translator(Converter):
 
         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.
+                `OPENAI_API_KEY` environment variable must be set.
             model_arguments: Additional arguments to pass to the LLM constructor.
             source_language: The source programming language.
             target_language: The target programming language.
@@ -67,7 +66,8 @@ class Translator(Converter):
             )
         self._target_language = target_language
         self._target_version = target_version
-        self._target_suffix = f".{LANGUAGES[target_language]['suffix']}"
+        # Taking the first suffix as the default for output files
+        self._target_suffix = f".{LANGUAGES[target_language]['suffixes'][0]}"
 
     @run_if_changed(
         "_prompt_template_name",

janus/embedding/collections.py

@@ -87,7 +87,7 @@ class Collections:
         """Get the Chroma collections.
 
         Returns:
-            The Chroma collections. Raises ValueError if not found.
+            The Chroma collections. Raises InvalidCollectionException if not found.
         """
         if isinstance(name, str):
             return [self._client.get_collection(name)]