From fd612979330ee0009ccbb14ac5bff894b675bb82 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Thu, 15 May 2025 21:19:19 -0700 Subject: [PATCH] Lint --- extensions/openai/completions.py | 8 ++++---- extensions/openai/utils.py | 6 +++--- extensions/superboogav2/chromadb.py | 3 ++- modules/tensorrt_llm.py | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/extensions/openai/completions.py b/extensions/openai/completions.py index ed0bcc40..5181b18b 100644 --- a/extensions/openai/completions.py +++ b/extensions/openai/completions.py @@ -1,14 +1,14 @@ import copy -import time import json +import time from collections import deque import tiktoken +from pydantic import ValidationError from extensions.openai.errors import InvalidRequestError -from extensions.openai.utils import debug_msg, getToolCallId, parseToolCall from extensions.openai.typing import ToolDefinition -from pydantic import ValidationError +from extensions.openai.utils import debug_msg, getToolCallId, parseToolCall from modules import shared from modules.chat import ( generate_chat_prompt, @@ -141,7 +141,7 @@ def chat_completions_common(body: dict, is_legacy: bool = False, stream=False, p tools = None if 'tools' in body and body['tools'] is not None and isinstance(body['tools'], list) and len(body['tools']) > 0: - tools = validateTools(body['tools']) # raises InvalidRequestError if validation fails + tools = validateTools(body['tools']) # raises InvalidRequestError if validation fails messages = body['messages'] for m in messages: diff --git a/extensions/openai/utils.py b/extensions/openai/utils.py index 8cb856ff..9a1de2e7 100644 --- a/extensions/openai/utils.py +++ b/extensions/openai/utils.py @@ -1,9 +1,9 @@ import base64 -import os -import time import json +import os import random import re +import time import traceback from typing import Callable, Optional @@ -91,7 +91,7 @@ def parseToolCall(answer: str, tool_names: list[str]): return matches # Define the regex pattern to find the JSON content wrapped in , , , and other tags observed from various models - patterns = [ r"(```[^\n]*)\n(.*?)```", r"<([^>]+)>(.*?)" ] + patterns = [r"(```[^\n]*)\n(.*?)```", r"<([^>]+)>(.*?)"] for pattern in patterns: for match in re.finditer(pattern, answer, re.DOTALL): diff --git a/extensions/superboogav2/chromadb.py b/extensions/superboogav2/chromadb.py index f4f77821..9344e25c 100644 --- a/extensions/superboogav2/chromadb.py +++ b/extensions/superboogav2/chromadb.py @@ -1,10 +1,11 @@ import math import random import threading -import torch + import chromadb import numpy as np import posthog +import torch from chromadb.config import Settings from chromadb.utils import embedding_functions diff --git a/modules/tensorrt_llm.py b/modules/tensorrt_llm.py index 73178c39..0527d493 100644 --- a/modules/tensorrt_llm.py +++ b/modules/tensorrt_llm.py @@ -1,15 +1,15 @@ from pathlib import Path -import torch - import tensorrt_llm +import torch +from tensorrt_llm.runtime import ModelRunner, ModelRunnerCpp + from modules import shared from modules.logging_colors import logger from modules.text_generation import ( get_max_prompt_length, get_reply_from_output_ids ) -from tensorrt_llm.runtime import ModelRunner, ModelRunnerCpp class TensorRTLLMModel: