vision-agent 0.2.146__py3-none-any.whl → 0.2.147__py3-none-any.whl

vision_agent/tools/meta_tools.py

@@ -643,7 +643,23 @@ def use_object_detection_fine_tuning(
         return output_str
 
     code = artifacts[name]
-    patterns = [
+
+    patterns_with_fine_tune_id = [
+        (
+            r'florence2_phrase_grounding\(\s*"([^"]+)"\s*,\s*([^,]+)(?:,\s*"[^"]+")?\s*\)',
+            lambda match: f'florence2_phrase_grounding("{match.group(1)}", {match.group(2)}, "{fine_tune_id}")',
+        ),
+        (
+            r'owl_v2_image\(\s*"([^"]+)"\s*,\s*([^,]+)(?:,\s*"[^"]+")?\s*\)',
+            lambda match: f'owl_v2_image("{match.group(1)}", {match.group(2)}, "{fine_tune_id}")',
+        ),
+        (
+            r'florence2_sam2_image\(\s*"([^"]+)"\s*,\s*([^,]+)(?:,\s*"[^"]+")?\s*\)',
+            lambda match: f'florence2_sam2_image("{match.group(1)}", {match.group(2)}, "{fine_tune_id}")',
+        ),
+    ]
+
+    patterns_without_fine_tune_id = [
         (
             r"florence2_phrase_grounding\(\s*([^\)]+)\s*\)",
             lambda match: f'florence2_phrase_grounding({match.group(1)}, "{fine_tune_id}")',
@@ -659,8 +675,21 @@ def use_object_detection_fine_tuning(
     ]
 
     new_code = code
-    for pattern, replacer in patterns:
-        new_code = re.sub(pattern, replacer, new_code)
+
+    for index, (pattern_with_fine_tune_id, replacer_with_fine_tune_id) in enumerate(
+        patterns_with_fine_tune_id
+    ):
+        if re.search(pattern_with_fine_tune_id, new_code):
+            new_code = re.sub(
+                pattern_with_fine_tune_id, replacer_with_fine_tune_id, new_code
+            )
+        else:
+            (pattern_without_fine_tune_id, replacer_without_fine_tune_id) = (
+                patterns_without_fine_tune_id[index]
+            )
+            new_code = re.sub(
+                pattern_without_fine_tune_id, replacer_without_fine_tune_id, new_code
+            )
 
     if new_code == code:
         output_str = (

{vision_agent-0.2.146.dist-info → vision_agent-0.2.147.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vision-agent
-Version: 0.2.146
+Version: 0.2.147
 Summary: Toolset for Vision Agent
 Author: Landing AI
 Author-email: dev@landing.ai

{vision_agent-0.2.146.dist-info → vision_agent-0.2.147.dist-info}/RECORD

@@ -15,7 +15,7 @@ vision_agent/lmm/__init__.py,sha256=jyY1sJb_tYKg5-Wzs3p1lvwFkc-aUNZfMcLy3TOC4Zg,
 vision_agent/lmm/lmm.py,sha256=B5ClgwvbybVCWkf9opDMLjTtJZemUU4KUkQoRxGh43I,16787
 vision_agent/lmm/types.py,sha256=ZEXR_ptBL0ZwDMTDYkgxUCmSZFmBYPQd2jreNzr_8UY,221
 vision_agent/tools/__init__.py,sha256=zUv3aVPN1MXfyQiQi5To4rkQGtG7mxLQ1NjLI3pxM80,2412
-vision_agent/tools/meta_tools.py,sha256=iHvMeBktWcVi-0DOrSMak1gsZrM_VKJlAq1mAFbBemE,23477
+vision_agent/tools/meta_tools.py,sha256=skY4nHSH7PFXNBAEKGYI6XZskv8zJ2UX1KbMY2gd_bo,24687
 vision_agent/tools/prompts.py,sha256=V1z4YJLXZuUl_iZ5rY0M5hHc_2tmMEUKr0WocXKGt4E,1430
 vision_agent/tools/tool_utils.py,sha256=5ukuDMxbEH4iKetYR9I7twzsA8ECyP4tVwYXQq54mxI,8020
 vision_agent/tools/tools.py,sha256=c7SjtZD7YfxhEAGYYe-ExVCBA4NDXmRwerBIbd-XEH8,74557
@@ -27,7 +27,7 @@ vision_agent/utils/image_utils.py,sha256=rm9GfXvD4JrjnqKrP_f2gfq4SzmqYC0IdC1kKwd
 vision_agent/utils/sim.py,sha256=ebE9Cs00pVEDI1HMjAzUBk88tQQmc2U-yAzIDinnekU,5572
 vision_agent/utils/type_defs.py,sha256=BE12s3JNQy36QvauXHjwyeffVh5enfcvd4vTzSwvEZI,1384
 vision_agent/utils/video.py,sha256=xbMEoRk13l4fHeQlbvMQhLCn8RNndYmsDhUf01TUeR8,4781
-vision_agent-0.2.146.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vision_agent-0.2.146.dist-info/METADATA,sha256=0xtIEPRJgc8ifV8z9C6OoLyi9w7wqQV7mpUmrWsLSVM,13758
-vision_agent-0.2.146.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-vision_agent-0.2.146.dist-info/RECORD,,
+vision_agent-0.2.147.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vision_agent-0.2.147.dist-info/METADATA,sha256=juNWGPjUPW3pxyGKPEBV_CwDllMnTj8B6c9Z7hevCyM,13758
+vision_agent-0.2.147.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+vision_agent-0.2.147.dist-info/RECORD,,