conflict

landing-ai · Aug 26, 2024 · a4552a3 · a4552a3
1 parent 8476e5e
commit a4552a3
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/vision_agent/tools/__init__.py b/vision_agent/tools/__init__.py
@@ -1,8 +1,6 @@
 from typing import Callable, List, Optional
 
-from .meta_tools import (
- META_TOOL_DOCSTRING,
-)
+from .meta_tools import META_TOOL_DOCSTRING
 from .prompts import CHOOSE_PARAMS, SYSTEM_PROMPT
 from .tools import (
  FUNCTION_TOOLS,
@@ -21,19 +19,12 @@
  detr_segmentation,
  dpt_hybrid_midas,
  extract_frames,
-<<<<<<< HEAD
- florencev2_image_caption,
- florencev2_object_detection,
- florencev2_ocr,
- florencev2_roberta_vqa,
-=======
  florence2_image_caption,
  florence2_object_detection,
  florence2_ocr,
  florence2_roberta_vqa,
  florence2_sam2_image,
  florence2_sam2_video,
->>>>>>> 7e149d14aec6a10989a8798d7df19987b475004c
  generate_pose_image,
  generate_soft_edge_image,
  get_tool_descriptions_by_names,