Skip to content

Commit dc3ea9c

Browse files
authored
Merge pull request #136 from SCAI-BIO/refactor-remove-deprecated
chore: remove legacy functions and modules
2 parents 91e733e + 3eb46ca commit dc3ea9c

14 files changed

Lines changed: 251 additions & 1243 deletions

datastew/__init__.py

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,50 @@
11
from ._version import __version__
2-
from .embedding import *
2+
from .embedding import EmbeddingModel, GPT4Adapter, HuggingFaceAdapter, OllamaAdapter, Vectorizer
33

44
# Importing submodules to expose their attributes if needed
5-
from .process import mapping, parsing
6-
from .repository import Concept, Mapping, Terminology, base, model, sqllite, weaviate
7-
from .visualisation import *
5+
from .process import jsonl_adapter, mapping, ols, parsing
6+
from .repository import (
7+
Concept,
8+
Mapping,
9+
Terminology,
10+
base,
11+
model,
12+
pagination,
13+
postgresql,
14+
sqllite,
15+
weaviate,
16+
weaviate_schema,
17+
)
18+
from .visualisation import (
19+
bar_chart_average_acc_two_distributions,
20+
enrichment_plot,
21+
get_plot_for_current_database_state,
22+
plot_embeddings,
23+
)
824

925
__all__ = [
26+
"__version__",
27+
"jsonl_adapter",
1028
"mapping",
29+
"ols",
1130
"parsing",
12-
"model",
1331
"base",
32+
"model",
33+
"pagination",
34+
"postgresql",
1435
"sqllite",
1536
"weaviate",
16-
"DataDictionarySource",
37+
"weaviate_schema",
38+
"EmbeddingModel",
39+
"GPT4Adapter",
1740
"HuggingFaceAdapter",
41+
"OllamaAdapter",
42+
"Vectorizer",
1843
"Terminology",
1944
"Concept",
2045
"Mapping",
21-
"get_default_embedding_model"
46+
"bar_chart_average_acc_two_distributions",
47+
"enrichment_plot",
48+
"get_plot_for_current_database_state",
49+
"plot_embeddings",
2250
]

datastew/_mapping.py

Lines changed: 0 additions & 189 deletions
This file was deleted.

datastew/conf.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

datastew/embedding.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from cachetools import LRUCache
88
from ollama import Client
99
from sentence_transformers import SentenceTransformer
10-
from typing_extensions import deprecated
1110

1211
logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
1312

@@ -331,10 +330,3 @@ def get_embedding(self, text: str):
331330

332331
def get_embeddings(self, messages: List[str]):
333332
return self.model.get_embeddings(messages)
334-
335-
336-
@deprecated("This class is deprecated and will be removed in the next major release due to refactoring of artifacts.")
337-
class TextEmbedding:
338-
def __init__(self, text: str, embedding: List[float]):
339-
self.text = text
340-
self.embedding = embedding

0 commit comments

Comments
 (0)