pyconverters-openai_vision 0.5.36__py3-none-any.whl → 0.5.40__py3-none-any.whl

pyconverters_openai_vision/__init__.py

@@ -1,2 +1,2 @@
 """OpenAIVision converter"""
-__version__ = "0.5.36"
+__version__ = "0.5.40"

pyconverters_openai_vision/openai_vision.py

@@ -147,10 +147,6 @@ class OpenAIVisionConverterBase(ConverterBase):
     PREFIX: str = ""
     oauth_token: OAuthToken = OAuthToken()
 
-    @classmethod
-    def is_model_gpt_5_model(cls, model: str) -> bool:
-        return "gpt-5" in model
-
     def compute_args(self, params: OpenAIVisionBaseParameters, source: UploadFile, kind
                      ) -> Dict[str, Any]:
         data = source.file.read()
@@ -171,11 +167,10 @@ class OpenAIVisionConverterBase(ConverterBase):
                              },
                              binary_block
                          ]})
-        max_tokens_param = 'max_completion_tokens' if self.is_model_gpt_5_model(params.model_str) else 'max_tokens'
         kwargs = {
             'model': params.model_str,
             'messages': messages,
-            max_tokens_param: params.max_tokens,
+            'max_tokens': params.max_tokens,
             'temperature': params.temperature,
             'top_p': params.top_p,
             'n': params.n,
@@ -185,7 +180,7 @@ class OpenAIVisionConverterBase(ConverterBase):
         return kwargs
 
     def compute_result(self, base_url, **kwargs):
-        pattern: Pattern = re.compile(r"```(?:markdown\s+)?(\W.*?)```", re.DOTALL)
+        pattern: Pattern = re.compile(r"```(?:markdown|json|python|html)?(\W.*?)```", re.DOTALL)
         """Regex pattern to parse the output."""
         response = openai_chat_completion(self.PREFIX, self.oauth_token, base_url, **kwargs)
         contents = []
@@ -196,6 +191,12 @@ class OpenAIVisionConverterBase(ConverterBase):
                     action_match = pattern.search(choice.message.content)
                     if action_match is not None:
                         contents.append(action_match.group(1).strip())
+                    else:
+                        action_match = re.search(r"```(.*?)```", choice.message.content, re.DOTALL)
+                        if action_match is not None:
+                            contents.append(action_match.group(1).strip())
+                        else:
+                            contents.append(choice.message.content)
                 else:
                     contents.append(choice.message.content)
         if contents:
@@ -362,10 +363,6 @@ class OpenAIVisionProcessorBase(ProcessorBase):
     PREFIX: str = ""
     oauth_token: OAuthToken = OAuthToken()
 
-    @classmethod
-    def is_model_gpt_5_model(cls, model: str) -> bool:
-        return "gpt-5" in model
-
     def compute_args(self, params: OpenAIVisionProcessorBaseParameters, source: str, kind
                      ) -> Dict[str, Any]:
         if kind.mime.startswith("image"):
@@ -384,11 +381,10 @@ class OpenAIVisionProcessorBase(ProcessorBase):
                              },
                              binary_block
                          ]})
-        max_tokens_param = 'max_completion_tokens' if self.is_model_gpt_5_model(params.model_str) else 'max_tokens'
         kwargs = {
             'model': params.model_str,
             'messages': messages,
-            max_tokens_param: params.max_tokens,
+            'max_tokens': params.max_tokens,
             'temperature': params.temperature,
             'top_p': params.top_p,
             'n': params.n,

{pyconverters_openai_vision-0.5.36.dist-info → pyconverters_openai_vision-0.5.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyconverters-openai_vision
-Version: 0.5.36
+Version: 0.5.40
 Summary: OpenAIVision converter
 Home-page: https://kairntech.com/
 Author: Olivier Terrier

pyconverters_openai_vision-0.5.40.dist-info/RECORD

@@ -0,0 +1,7 @@
+pyconverters_openai_vision/__init__.py,sha256=nllf2jeljyeVthNdUtweGUh38v8sV1ezGTwnUTROXMc,52
+pyconverters_openai_vision/openai_utils.py,sha256=XI4WYZ-EAVG0Vxd5yUDuZNDgEzqHJeriScxTUusi1oo,7740
+pyconverters_openai_vision/openai_vision.py,sha256=GLV7CsovwVlrqD9HpmKmsoTwJ9jWLwfIbJESx6Q1uHU,23696
+pyconverters_openai_vision-0.5.40.dist-info/entry_points.txt,sha256=NR0re-yebKKyhApky1I6nDQzjJQfEyfOkJlJju0Ngzo,404
+pyconverters_openai_vision-0.5.40.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pyconverters_openai_vision-0.5.40.dist-info/METADATA,sha256=qrtL9hAuepmZMVz-Vyp7qZEhOs0ljksMGZxjluAkfTE,2662
+pyconverters_openai_vision-0.5.40.dist-info/RECORD,,

pyconverters_openai_vision-0.5.36.dist-info/RECORD

@@ -1,7 +0,0 @@
-pyconverters_openai_vision/__init__.py,sha256=-BX6FHKC8AX-7vCq_-SC81FmeXDVkY1SIy4vU9f9-gU,52
-pyconverters_openai_vision/openai_utils.py,sha256=XI4WYZ-EAVG0Vxd5yUDuZNDgEzqHJeriScxTUusi1oo,7740
-pyconverters_openai_vision/openai_vision.py,sha256=Lp8g8KbTvRznOrC7dPRM-C9qmZcgzs-Kq6QidHtZwA4,23780
-pyconverters_openai_vision-0.5.36.dist-info/entry_points.txt,sha256=NR0re-yebKKyhApky1I6nDQzjJQfEyfOkJlJju0Ngzo,404
-pyconverters_openai_vision-0.5.36.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-pyconverters_openai_vision-0.5.36.dist-info/METADATA,sha256=govETANuIkSFp_1AAH1t2AxwryMgupNpZ2VERpWhbyI,2662
-pyconverters_openai_vision-0.5.36.dist-info/RECORD,,