From a4552a35600ce06aae4af9ebbc329b805fd7b4ec Mon Sep 17 00:00:00 2001 From: Mingrui Zhang Date: Tue, 27 Aug 2024 07:19:17 +0800 Subject: [PATCH] conflict --- vision_agent/tools/__init__.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/vision_agent/tools/__init__.py b/vision_agent/tools/__init__.py index 9255df79..1ba9c11a 100644 --- 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,