summaryrefslogtreecommitdiff
path: root/rag/generator
diff options
context:
space:
mode:
authorGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-09 01:06:26 +0200
committerGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-09 01:06:26 +0200
commite09f5ff897543a93f561af68e3173050b1fe4b45 (patch)
tree47b2047eb0071f782e77ae030a97edbd17f47785 /rag/generator
parent73a4adb6d4161ea222ed1ba56413571892da73d6 (diff)
Fix import order
Diffstat (limited to 'rag/generator')
-rw-r--r--rag/generator/__init__.py2
-rw-r--r--rag/generator/abstract.py1
-rw-r--r--rag/generator/cohere.py9
-rw-r--r--rag/generator/ollama.py6
-rw-r--r--rag/generator/prompt.py1
5 files changed, 8 insertions, 11 deletions
diff --git a/rag/generator/__init__.py b/rag/generator/__init__.py
index 541eff8..ba23ffc 100644
--- a/rag/generator/__init__.py
+++ b/rag/generator/__init__.py
@@ -1,8 +1,8 @@
from typing import Type
from .abstract import AbstractGenerator
-from .ollama import Ollama
from .cohere import Cohere
+from .ollama import Ollama
MODELS = ["ollama", "cohere"]
diff --git a/rag/generator/abstract.py b/rag/generator/abstract.py
index 5b336ea..1beacfb 100644
--- a/rag/generator/abstract.py
+++ b/rag/generator/abstract.py
@@ -1,5 +1,4 @@
from abc import abstractmethod
-
from typing import Any, Generator
from .prompt import Prompt
diff --git a/rag/generator/cohere.py b/rag/generator/cohere.py
index cf95c18..7028b21 100644
--- a/rag/generator/cohere.py
+++ b/rag/generator/cohere.py
@@ -1,13 +1,12 @@
import os
+from dataclasses import asdict
from typing import Any, Generator
-import cohere
-from dataclasses import asdict
+import cohere
+from loguru import logger as log
-from .prompt import Prompt
from .abstract import AbstractGenerator
-
-from loguru import logger as log
+from .prompt import Prompt
class Cohere(metaclass=AbstractGenerator):
diff --git a/rag/generator/ollama.py b/rag/generator/ollama.py
index 1e968f6..cd8533b 100644
--- a/rag/generator/ollama.py
+++ b/rag/generator/ollama.py
@@ -4,11 +4,11 @@ from typing import Any, Generator, List
import ollama
from loguru import logger as log
-from .prompt import Prompt
-from .abstract import AbstractGenerator
-
from rag.retriever.vector import Document
+from .abstract import AbstractGenerator
+from .prompt import Prompt
+
SYSTEM_PROMPT = (
"# System Preamble"
"## Basic Rules"
diff --git a/rag/generator/prompt.py b/rag/generator/prompt.py
index 059592a..41f264e 100644
--- a/rag/generator/prompt.py
+++ b/rag/generator/prompt.py
@@ -1,7 +1,6 @@
from dataclasses import dataclass
from typing import List
-
from rag.retriever.vector import Document