diff --git a/README.md b/README.md index f427054..1f6bac6 100644 --- a/README.md +++ b/README.md @@ -102,8 +102,8 @@ pip install -e . import torch from transformers import AutoModelForCausalLM -from deepseek_vl.models import DeepseekVLV2Processor, DeepseekVLV2ForCausalLM -from deepseek_vl.utils.io import load_pil_images +from deepseek_vl2.models import DeepseekVLV2Processor, DeepseekVLV2ForCausalLM +from deepseek_vl2.utils.io import load_pil_images # specify the path to the model diff --git a/deepseek_vl/__init__.py b/deepseek_vl2/__init__.py similarity index 100% rename from deepseek_vl/__init__.py rename to deepseek_vl2/__init__.py diff --git a/deepseek_vl/models/__init__.py b/deepseek_vl2/models/__init__.py similarity index 100% rename from deepseek_vl/models/__init__.py rename to deepseek_vl2/models/__init__.py diff --git a/deepseek_vl/models/configuration_deepseek.py b/deepseek_vl2/models/configuration_deepseek.py similarity index 100% rename from deepseek_vl/models/configuration_deepseek.py rename to deepseek_vl2/models/configuration_deepseek.py diff --git a/deepseek_vl/models/conversation.py b/deepseek_vl2/models/conversation.py similarity index 100% rename from deepseek_vl/models/conversation.py rename to deepseek_vl2/models/conversation.py diff --git a/deepseek_vl/models/modeling_deepseek.py b/deepseek_vl2/models/modeling_deepseek.py similarity index 100% rename from deepseek_vl/models/modeling_deepseek.py rename to deepseek_vl2/models/modeling_deepseek.py diff --git a/deepseek_vl/models/modeling_deepseek_vl_v2.py b/deepseek_vl2/models/modeling_deepseek_vl_v2.py similarity index 100% rename from deepseek_vl/models/modeling_deepseek_vl_v2.py rename to deepseek_vl2/models/modeling_deepseek_vl_v2.py diff --git a/deepseek_vl/models/processing_deepseek_vl_v2.py b/deepseek_vl2/models/processing_deepseek_vl_v2.py similarity index 99% rename from deepseek_vl/models/processing_deepseek_vl_v2.py rename to deepseek_vl2/models/processing_deepseek_vl_v2.py index 8970dbb..0a98e50 100644 --- a/deepseek_vl/models/processing_deepseek_vl_v2.py +++ b/deepseek_vl2/models/processing_deepseek_vl_v2.py @@ -559,7 +559,7 @@ class DeepseekVLV2Processor(ProcessorMixin): for j in range(0, best_width, self.image_size): images_list.append( self.image_transform(local_view.crop((j, i, j + self.image_size, i + self.image_size)))) - + """record height / width crop num""" num_width_tiles, num_height_tiles = best_width // self.image_size, best_height // self.image_size images_spatial_crop.append([num_width_tiles, num_height_tiles]) diff --git a/deepseek_vl/models/siglip_vit.py b/deepseek_vl2/models/siglip_vit.py similarity index 100% rename from deepseek_vl/models/siglip_vit.py rename to deepseek_vl2/models/siglip_vit.py diff --git a/deepseek_vl/serve/__init__.py b/deepseek_vl2/serve/__init__.py similarity index 100% rename from deepseek_vl/serve/__init__.py rename to deepseek_vl2/serve/__init__.py diff --git a/deepseek_vl/serve/app_modules/__init__.py b/deepseek_vl2/serve/app_modules/__init__.py similarity index 100% rename from deepseek_vl/serve/app_modules/__init__.py rename to deepseek_vl2/serve/app_modules/__init__.py diff --git a/deepseek_vl/serve/app_modules/gradio_utils.py b/deepseek_vl2/serve/app_modules/gradio_utils.py similarity index 100% rename from deepseek_vl/serve/app_modules/gradio_utils.py rename to deepseek_vl2/serve/app_modules/gradio_utils.py diff --git a/deepseek_vl/serve/app_modules/overwrites.py b/deepseek_vl2/serve/app_modules/overwrites.py similarity index 90% rename from deepseek_vl/serve/app_modules/overwrites.py rename to deepseek_vl2/serve/app_modules/overwrites.py index a060c05..6634119 100755 --- a/deepseek_vl/serve/app_modules/overwrites.py +++ b/deepseek_vl2/serve/app_modules/overwrites.py @@ -22,8 +22,8 @@ from __future__ import annotations import logging from typing import List, Tuple -from deepseek_vl.serve.app_modules.presets import gr -from deepseek_vl.serve.app_modules.utils import convert_asis, convert_mdtext, detect_converted_mark +from deepseek_vl2.serve.app_modules.presets import gr +from deepseek_vl2.serve.app_modules.utils import convert_asis, convert_mdtext, detect_converted_mark def compact_text_chunks(self, prompt, text_chunks: List[str]) -> List[str]: @@ -58,8 +58,8 @@ def postprocess( return temp -with open("deepseek_vl/serve/assets/custom.js", "r", encoding="utf-8") as f, open( - "deepseek_vl/serve/assets/Kelpy-Codos.js", "r", encoding="utf-8" +with open("deepseek_vl2/serve/assets/custom.js", "r", encoding="utf-8") as f, open( + "deepseek_vl2/serve/assets/Kelpy-Codos.js", "r", encoding="utf-8" ) as f2: customJS = f.read() kelpyCodos = f2.read() diff --git a/deepseek_vl/serve/app_modules/presets.py b/deepseek_vl2/serve/app_modules/presets.py similarity index 100% rename from deepseek_vl/serve/app_modules/presets.py rename to deepseek_vl2/serve/app_modules/presets.py diff --git a/deepseek_vl/serve/app_modules/utils.py b/deepseek_vl2/serve/app_modules/utils.py similarity index 97% rename from deepseek_vl/serve/app_modules/utils.py rename to deepseek_vl2/serve/app_modules/utils.py index 68aa176..7eb3f9e 100755 --- a/deepseek_vl/serve/app_modules/utils.py +++ b/deepseek_vl2/serve/app_modules/utils.py @@ -35,7 +35,7 @@ from pygments import highlight from pygments.formatters import HtmlFormatter from pygments.lexers import ClassNotFound, get_lexer_by_name, guess_lexer -from deepseek_vl.serve.app_modules.presets import ( +from deepseek_vl2.serve.app_modules.presets import ( ALREADY_CONVERTED_MARK, BOX2COLOR, MAX_IMAGE_SIZE, @@ -50,9 +50,9 @@ def configure_logger(): logger.setLevel(logging.DEBUG) timestr = time.strftime("%Y%m%d-%H%M%S") - os.makedirs("deepseek_vl/serve/logs", exist_ok=True) + os.makedirs("deepseek_vl2/serve/logs", exist_ok=True) file_handler = logging.FileHandler( - f"deepseek_vl/serve/logs/{timestr}_gradio_log.log" + f"deepseek_vl2/serve/logs/{timestr}_gradio_log.log" ) console_handler = logging.StreamHandler() @@ -301,7 +301,7 @@ def parse_ref_bbox(response, image): text_x = box[0] text_y = box[1] - 20 text_color = box_color - font = ImageFont.truetype('./deepseek_vl/serve/assets/simsun.ttc', size=20) + font = ImageFont.truetype('./deepseek_vl2/serve/assets/simsun.ttc', size=20) draw.text((text_x, text_y), label, font=font, fill=text_color) return image diff --git a/deepseek_vl/serve/assets/Kelpy-Codos.js b/deepseek_vl2/serve/assets/Kelpy-Codos.js similarity index 100% rename from deepseek_vl/serve/assets/Kelpy-Codos.js rename to deepseek_vl2/serve/assets/Kelpy-Codos.js diff --git a/deepseek_vl/serve/assets/avatar.png b/deepseek_vl2/serve/assets/avatar.png similarity index 100% rename from deepseek_vl/serve/assets/avatar.png rename to deepseek_vl2/serve/assets/avatar.png diff --git a/deepseek_vl/serve/assets/custom.css b/deepseek_vl2/serve/assets/custom.css similarity index 100% rename from deepseek_vl/serve/assets/custom.css rename to deepseek_vl2/serve/assets/custom.css diff --git a/deepseek_vl/serve/assets/custom.js b/deepseek_vl2/serve/assets/custom.js similarity index 100% rename from deepseek_vl/serve/assets/custom.js rename to deepseek_vl2/serve/assets/custom.js diff --git a/deepseek_vl/serve/assets/favicon.ico b/deepseek_vl2/serve/assets/favicon.ico similarity index 100% rename from deepseek_vl/serve/assets/favicon.ico rename to deepseek_vl2/serve/assets/favicon.ico diff --git a/deepseek_vl/serve/assets/simsun.ttc b/deepseek_vl2/serve/assets/simsun.ttc similarity index 100% rename from deepseek_vl/serve/assets/simsun.ttc rename to deepseek_vl2/serve/assets/simsun.ttc diff --git a/deepseek_vl/serve/examples/app.png b/deepseek_vl2/serve/examples/app.png similarity index 100% rename from deepseek_vl/serve/examples/app.png rename to deepseek_vl2/serve/examples/app.png diff --git a/deepseek_vl/serve/examples/chart.png b/deepseek_vl2/serve/examples/chart.png similarity index 100% rename from deepseek_vl/serve/examples/chart.png rename to deepseek_vl2/serve/examples/chart.png diff --git a/deepseek_vl/serve/examples/mirror.png b/deepseek_vl2/serve/examples/mirror.png similarity index 100% rename from deepseek_vl/serve/examples/mirror.png rename to deepseek_vl2/serve/examples/mirror.png diff --git a/deepseek_vl/serve/examples/pipeline.png b/deepseek_vl2/serve/examples/pipeline.png similarity index 100% rename from deepseek_vl/serve/examples/pipeline.png rename to deepseek_vl2/serve/examples/pipeline.png diff --git a/deepseek_vl/serve/examples/puzzle.png b/deepseek_vl2/serve/examples/puzzle.png similarity index 100% rename from deepseek_vl/serve/examples/puzzle.png rename to deepseek_vl2/serve/examples/puzzle.png diff --git a/deepseek_vl/serve/examples/rap.jpeg b/deepseek_vl2/serve/examples/rap.jpeg similarity index 100% rename from deepseek_vl/serve/examples/rap.jpeg rename to deepseek_vl2/serve/examples/rap.jpeg diff --git a/deepseek_vl/serve/inference.py b/deepseek_vl2/serve/inference.py similarity index 97% rename from deepseek_vl/serve/inference.py rename to deepseek_vl2/serve/inference.py index 16bf510..2fe367d 100755 --- a/deepseek_vl/serve/inference.py +++ b/deepseek_vl2/serve/inference.py @@ -30,8 +30,8 @@ from transformers import ( TextIteratorStreamer, ) -from deepseek_vl.models import DeepseekVLV2Processor, DeepseekVLV2ForCausalLM -from deepseek_vl.models.conversation import Conversation +from deepseek_vl2.models import DeepseekVLV2Processor, DeepseekVLV2ForCausalLM +from deepseek_vl2.models.conversation import Conversation def load_model(model_path, dtype=torch.bfloat16): diff --git a/deepseek_vl/utils/__init__.py b/deepseek_vl2/utils/__init__.py similarity index 100% rename from deepseek_vl/utils/__init__.py rename to deepseek_vl2/utils/__init__.py diff --git a/deepseek_vl/utils/io.py b/deepseek_vl2/utils/io.py similarity index 94% rename from deepseek_vl/utils/io.py rename to deepseek_vl2/utils/io.py index 49b7ebb..77a5014 100644 --- a/deepseek_vl/utils/io.py +++ b/deepseek_vl2/utils/io.py @@ -27,8 +27,8 @@ from transformers import AutoModelForCausalLM def load_pretrained_model(model_path: str): - from deepseek_vl.models.processing_deepseek_vl_v2 import DeepseekVLV2Processor - from deepseek_vl.models.modeling_deepseek_vl_v2 import DeepseekVLV2ForCausalLM + from deepseek_vl2.models.processing_deepseek_vl_v2 import DeepseekVLV2Processor + from deepseek_vl2.models.modeling_deepseek_vl_v2 import DeepseekVLV2ForCausalLM vl_chat_processor = DeepseekVLV2Processor.from_pretrained(model_path) tokenizer = vl_chat_processor.tokenizer diff --git a/inference.py b/inference.py index beac69a..26abce6 100644 --- a/inference.py +++ b/inference.py @@ -24,8 +24,8 @@ from transformers import AutoModelForCausalLM import PIL.Image -from deepseek_vl.models import DeepseekVLV2ForCausalLM, DeepseekVLV2Processor -from deepseek_vl.serve.app_modules.utils import parse_ref_bbox +from deepseek_vl2.models import DeepseekVLV2ForCausalLM, DeepseekVLV2Processor +from deepseek_vl2.serve.app_modules.utils import parse_ref_bbox def load_pil_images(conversations: List[Dict[str, str]]) -> List[PIL.Image.Image]: diff --git a/pyproject.toml b/pyproject.toml index 876d479..2710fee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,12 +3,12 @@ requires = ["setuptools>=40.6.0", "wheel"] build-backend = "setuptools.build_meta" [project] -name = "deepseek_vl" +name = "deepseek_vl2" version = "1.0.0" -description = "DeepSeek-VL" +description = "DeepSeek-VL2" authors = [{name = "DeepSeek-AI"}] license = {file = "LICENSE-CODE"} -urls = {homepage = "https://github.com/deepseek-ai/DeepSeek-VL"} +urls = {homepage = "https://github.com/deepseek-ai/DeepSeek-VL2"} readme = "README.md" requires-python = ">=3.8" dependencies = [