Skip to content

Commit 6ed4b17

Browse files
Merge pull request #9 from deepsense-ai/namespaced_packages
chore: switch to native namespaced packages
2 parents 9082362 + 8ed90d9 commit 6ed4b17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+85
-79
lines changed

packages/ragbits-common/examples/llm_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from pydantic import BaseModel
44

5-
from ragbits_common.llms.litellm import LiteLLM
6-
from ragbits_common.prompt import Prompt
5+
from ragbits.common.llms.litellm import LiteLLM
6+
from ragbits.common.prompt import Prompt
77

88

99
class LoremPromptInput(BaseModel):

packages/ragbits-common/examples/prompt_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pydantic import BaseModel
22

3-
from ragbits_common.prompt import Prompt
3+
from ragbits.common.prompt import Prompt
44

55

66
class LoremPromptInput(BaseModel):

packages/ragbits-common/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ classifiers =
2222
[options]
2323
package_dir=
2424
=src
25-
packages=find:
25+
packages=find_namespace:
2626
zip_safe = False
2727
platforms = any
2828
include_package_data = True

packages/ragbits-common/src/ragbits_common/embeddings/litellm.py renamed to packages/ragbits-common/src/ragbits/common/embeddings/litellm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
except ImportError:
88
HAS_LITELLM = False
99

10-
from ragbits_common.embeddings.base import Embeddings
11-
from ragbits_common.embeddings.exceptions import EmbeddingConnectionError, EmbeddingResponseError, EmbeddingStatusError
10+
from ragbits.common.embeddings.base import Embeddings
11+
from ragbits.common.embeddings.exceptions import EmbeddingConnectionError, EmbeddingResponseError, EmbeddingStatusError
1212

1313

1414
class LiteLLMEmbeddings(Embeddings):

packages/ragbits-common/src/ragbits_common/llms/base.py renamed to packages/ragbits-common/src/ragbits/common/llms/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from functools import cached_property
33
from typing import Generic, Optional, Type, cast, overload
44

5-
from ragbits_common.prompt.base import BasePrompt, BasePromptWithParser, OutputT
5+
from ragbits.common.prompt.base import BasePrompt, BasePromptWithParser, OutputT
66

77
from .clients.base import LLMClient, LLMClientOptions, LLMOptions
88

packages/ragbits-common/src/ragbits_common/llms/clients/base.py renamed to packages/ragbits-common/src/ragbits/common/llms/clients/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from pydantic import BaseModel
66

7-
from ragbits_common.prompt import ChatFormat
7+
from ragbits.common.prompt import ChatFormat
88

99
from ..types import NotGiven
1010

packages/ragbits-common/src/ragbits_common/llms/clients/litellm.py renamed to packages/ragbits-common/src/ragbits/common/llms/clients/litellm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
HAS_LITELLM = False
1212

1313

14-
from ragbits_common.prompt import ChatFormat
14+
from ragbits.common.prompt import ChatFormat
1515

1616
from ..types import NOT_GIVEN, NotGiven
1717
from .base import LLMClient, LLMOptions

packages/ragbits-common/src/ragbits_common/llms/clients/local.py renamed to packages/ragbits-common/src/ragbits/common/llms/clients/local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
except ImportError:
1212
HAS_LOCAL_LLM = False
1313

14-
from ragbits_common.prompt import ChatFormat
14+
from ragbits.common.prompt import ChatFormat
1515

1616
from ..types import NOT_GIVEN, NotGiven
1717
from .base import LLMClient, LLMOptions

packages/ragbits-common/src/ragbits_common/llms/litellm.py renamed to packages/ragbits-common/src/ragbits/common/llms/litellm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
except ImportError:
99
HAS_LITELLM = False
1010

11-
from ragbits_common.prompt.base import BasePrompt
11+
from ragbits.common.prompt.base import BasePrompt
1212

1313
from .base import LLM
1414
from .clients.litellm import LiteLLMClient, LiteLLMOptions

packages/ragbits-common/src/ragbits_common/llms/local.py renamed to packages/ragbits-common/src/ragbits/common/llms/local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
except ImportError:
99
HAS_LOCAL_LLM = False
1010

11-
from ragbits_common.prompt.base import BasePrompt
11+
from ragbits.common.prompt.base import BasePrompt
1212

1313
from .base import LLM
1414
from .clients.local import LocalLLMClient, LocalLLMOptions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from ragbits.common.prompt.prompt import ChatFormat, Prompt
2+
3+
__all__ = ["Prompt", "ChatFormat"]

packages/ragbits-common/src/ragbits_common/prompt/__init__.py

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

packages/ragbits-common/tests/unit/llms/test_litellm.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from pydantic import BaseModel
22

3-
from ragbits_common.llms.clients.litellm import LiteLLMOptions
4-
from ragbits_common.llms.litellm import LiteLLM
5-
from ragbits_common.prompt import Prompt
6-
from ragbits_common.prompt.base import BasePrompt, BasePromptWithParser, ChatFormat
3+
from ragbits.common.llms.clients.litellm import LiteLLMOptions
4+
from ragbits.common.llms.litellm import LiteLLM
5+
from ragbits.common.prompt import Prompt
6+
from ragbits.common.prompt.base import BasePrompt, BasePromptWithParser, ChatFormat
77

88

99
class MockPrompt(BasePrompt):

packages/ragbits-common/tests/unit/prompts/test_parsers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import pytest
44

5-
from ragbits_common.prompt import Prompt
6-
from ragbits_common.prompt.parsers import ResponseParsingError
5+
from ragbits.common.prompt import Prompt
6+
from ragbits.common.prompt.parsers import ResponseParsingError
77

88
from .test_prompt import _PromptOutput
99

packages/ragbits-common/tests/unit/prompts/test_prompt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pydantic
22
import pytest
33

4-
from ragbits_common.prompt import Prompt
4+
from ragbits.common.prompt import Prompt
55

66

77
class _PromptInput(pydantic.BaseModel):

packages/ragbits-dev-kit/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ classifiers =
2222
[options]
2323
package_dir=
2424
=src
25-
packages=find:
25+
packages=find_namespace:
2626
zip_safe = False
2727
platforms = any
2828
include_package_data = True

packages/ragbits-dev-kit/src/ragbits_dev_kit/app/main.py renamed to packages/ragbits-dev-kit/src/ragbits/dev_kit/app/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import jinja2
66
import typer
77
from pydantic import BaseModel
8-
from ragbits_dev_kit.discovery.prompt_discovery import PromptDiscovery
98

10-
from ragbits_common.llms import LiteLLM
11-
from ragbits_common.llms.clients import LiteLLMOptions
9+
from ragbits.common.llms import LiteLLM
10+
from ragbits.common.llms.clients import LiteLLMOptions
11+
from ragbits.dev_kit.discovery.prompt_discovery import PromptDiscovery
1212

1313

1414
class PromptState:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from ragbits.dev_kit.discovery.prompt_discovery import PromptDiscovery
2+
3+
__all__ = ["PromptDiscovery"]

packages/ragbits-dev-kit/src/ragbits_dev_kit/discovery/prompt_discovery.py renamed to packages/ragbits-dev-kit/src/ragbits/dev_kit/discovery/prompt_discovery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from collections import namedtuple
55
from typing import Any
66

7-
from ragbits_common.prompt import Prompt
7+
from ragbits.common.prompt import Prompt
88

99
PromptDetails = namedtuple("PromptDetails", ["system_prompt", "user_prompt", "input_type", "object"])
1010

packages/ragbits-dev-kit/src/ragbits_dev_kit/discovery/__init__.py

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

packages/ragbits-dev-kit/tests/unit/discovery/prompt_classes_for_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from pydantic import BaseModel
44

5-
from ragbits_common.prompt import Prompt
5+
from ragbits.common.prompt import Prompt
66

77

88
class PromptForTestInput(BaseModel):

packages/ragbits-dev-kit/tests/unit/discovery/ragbits_tests_pkg_with_prompts/prompts/temp_prompt1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pydantic import BaseModel
22

3-
from ragbits_common.prompt import Prompt
3+
from ragbits.common.prompt import Prompt
44

55

66
class PromptForTestInputA(BaseModel):

packages/ragbits-dev-kit/tests/unit/discovery/ragbits_tests_pkg_with_prompts/prompts/temp_prompt2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from pydantic import BaseModel
22

3-
from ragbits_common.prompt import Prompt
3+
from ragbits.common.prompt import Prompt
44

55

66
class PromptForTestInputB(BaseModel):

packages/ragbits-dev-kit/tests/unit/discovery/test_prompt_discovery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sys
22
from pathlib import Path
33

4-
from ragbits_dev_kit.discovery.prompt_discovery import PromptDiscovery
4+
from ragbits.dev_kit.discovery.prompt_discovery import PromptDiscovery
55

66

77
def test_prompt_discovery_from_file():

packages/ragbits-document-search/examples/simple_text.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import asyncio
22

3-
from ragbits_document_search import DocumentSearch
4-
from ragbits_document_search.documents.document import DocumentMeta
5-
from ragbits_document_search.vector_store.in_memory import InMemoryVectorStore
6-
7-
from ragbits_common.embeddings.litellm import LiteLLMEmbeddings
3+
from ragbits.common.embeddings.litellm import LiteLLMEmbeddings
4+
from ragbits.document_search import DocumentSearch
5+
from ragbits.document_search.documents.document import DocumentMeta
6+
from ragbits.document_search.vector_store.in_memory import InMemoryVectorStore
87

98
documents = [
109
DocumentMeta.create_text_document_from_literal("RIP boiled water. You will be mist."),

packages/ragbits-document-search/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ classifiers =
2323
[options]
2424
package_dir=
2525
=src
26-
packages=find:
26+
packages=find_namespace:
2727
zip_safe = False
2828
platforms = any
2929
include_package_data = True

packages/ragbits-document-search/src/ragbits_document_search/_main.py renamed to packages/ragbits-document-search/src/ragbits/document_search/_main.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
from ragbits_document_search.documents.document import DocumentMeta
2-
from ragbits_document_search.documents.element import Element
3-
from ragbits_document_search.ingestion.document_processor import DocumentProcessor
4-
from ragbits_document_search.retrieval.rephrasers.base import QueryRephraser
5-
from ragbits_document_search.retrieval.rephrasers.noop import NoopQueryRephraser
6-
from ragbits_document_search.retrieval.rerankers.base import Reranker
7-
from ragbits_document_search.retrieval.rerankers.noop import NoopReranker
8-
from ragbits_document_search.vector_store.base import VectorStore
9-
10-
from ragbits_common.embeddings.base import Embeddings
1+
from ragbits.common.embeddings.base import Embeddings
2+
from ragbits.document_search.documents.document import DocumentMeta
3+
from ragbits.document_search.documents.element import Element
4+
from ragbits.document_search.ingestion.document_processor import DocumentProcessor
5+
from ragbits.document_search.retrieval.rephrasers.base import QueryRephraser
6+
from ragbits.document_search.retrieval.rephrasers.noop import NoopQueryRephraser
7+
from ragbits.document_search.retrieval.rerankers.base import Reranker
8+
from ragbits.document_search.retrieval.rerankers.noop import NoopReranker
9+
from ragbits.document_search.vector_store.base import VectorStore
1110

1211

1312
class DocumentSearch:

packages/ragbits-document-search/src/ragbits_document_search/documents/document.py renamed to packages/ragbits-document-search/src/ragbits/document_search/documents/document.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from typing import Union
55

66
from pydantic import BaseModel, Field
7-
from ragbits_document_search.documents.sources import LocalFileSource
7+
8+
from ragbits.document_search.documents.sources import LocalFileSource
89

910

1011
class DocumentType(str, Enum):

packages/ragbits-document-search/src/ragbits_document_search/documents/element.py renamed to packages/ragbits-document-search/src/ragbits/document_search/documents/element.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
from typing import ClassVar
33

44
from pydantic import BaseModel
5-
from ragbits_document_search.documents.document import DocumentMeta
6-
from ragbits_document_search.vector_store.base import VectorDBEntry
5+
6+
from ragbits.document_search.documents.document import DocumentMeta
7+
from ragbits.document_search.vector_store.base import VectorDBEntry
78

89

910
class Element(BaseModel, ABC):
@@ -26,7 +27,7 @@ def get_key(self) -> str:
2627
"""
2728

2829
@classmethod
29-
def __pydantic_init_subclass__(cls, **kwargs): # pylint: disable=unused-argument
30+
def __pydantic_init_subclass__(cls, **kwargs: dict) -> None: # pylint: disable=unused-argument
3031
element_type_default = cls.model_fields["element_type"].default
3132

3233
if element_type_default is None:

packages/ragbits-document-search/src/ragbits_document_search/ingestion/document_processor.py renamed to packages/ragbits-document-search/src/ragbits/document_search/ingestion/document_processor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
from typing import List
66

7-
from ragbits_document_search.documents.document import DocumentMeta, TextDocument
8-
from ragbits_document_search.documents.element import Element, TextElement
7+
from ragbits.document_search.documents.document import DocumentMeta, TextDocument
8+
from ragbits.document_search.documents.element import Element, TextElement
99

1010

1111
class DocumentProcessor:

packages/ragbits-document-search/src/ragbits_document_search/retrieval/rephrasers/noop.py renamed to packages/ragbits-document-search/src/ragbits/document_search/retrieval/rephrasers/noop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ragbits_document_search.retrieval.rephrasers.base import QueryRephraser
1+
from ragbits.document_search.retrieval.rephrasers.base import QueryRephraser
22

33

44
class NoopQueryRephraser(QueryRephraser):

packages/ragbits-document-search/src/ragbits_document_search/retrieval/rerankers/base.py renamed to packages/ragbits-document-search/src/ragbits/document_search/retrieval/rerankers/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import abc
22

3-
from ragbits_document_search.documents.element import Element
3+
from ragbits.document_search.documents.element import Element
44

55

66
class Reranker(abc.ABC):

packages/ragbits-document-search/src/ragbits_document_search/retrieval/rerankers/noop.py renamed to packages/ragbits-document-search/src/ragbits/document_search/retrieval/rerankers/noop.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import List
22

3-
from ragbits_document_search.documents.element import Element
4-
from ragbits_document_search.retrieval.rerankers.base import Reranker
3+
from ragbits.document_search.documents.element import Element
4+
from ragbits.document_search.retrieval.rerankers.base import Reranker
55

66

77
class NoopReranker(Reranker):

packages/ragbits-document-search/src/ragbits_document_search/vector_store/in_memory.py renamed to packages/ragbits-document-search/src/ragbits/document_search/vector_store/in_memory.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import numpy as np
2-
from ragbits_document_search.vector_store.base import VectorDBEntry, VectorStore
2+
3+
from ragbits.document_search.vector_store.base import VectorDBEntry, VectorStore
34

45

56
class InMemoryVectorStore(VectorStore):
67
"""
78
A simple in-memory implementation of Vector Store, storing vectors in memory.
89
"""
910

10-
def __init__(self):
11-
self._storage = {}
11+
def __init__(self) -> None:
12+
self._storage: dict[str, VectorDBEntry] = {}
1213

1314
async def store(self, entries: list[VectorDBEntry]) -> None:
1415
"""

packages/ragbits-document-search/src/ragbits/py.typed

Whitespace-only changes.

packages/ragbits-document-search/tests/unit/test_document_search.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from unittest.mock import AsyncMock
22

3-
from ragbits_document_search import DocumentSearch
4-
from ragbits_document_search.documents.document import DocumentMeta
5-
from ragbits_document_search.documents.element import TextElement
6-
from ragbits_document_search.vector_store.in_memory import InMemoryVectorStore
3+
from ragbits.document_search import DocumentSearch
4+
from ragbits.document_search.documents.document import DocumentMeta
5+
from ragbits.document_search.documents.element import TextElement
6+
from ragbits.document_search.vector_store.in_memory import InMemoryVectorStore
77

88

99
async def test_document_search():

packages/ragbits-document-search/tests/unit/test_documents.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import tempfile
22
from pathlib import Path
33

4-
from ragbits_document_search.documents.document import DocumentMeta, DocumentType, TextDocument
5-
from ragbits_document_search.documents.sources import LocalFileSource
4+
from ragbits.document_search.documents.document import DocumentMeta, DocumentType, TextDocument
5+
from ragbits.document_search.documents.sources import LocalFileSource
66

77

88
async def test_loading_local_file_source():

packages/ragbits-document-search/tests/unit/test_elements.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from ragbits_document_search.documents.document import DocumentType
2-
from ragbits_document_search.documents.element import Element
3-
from ragbits_document_search.vector_store.base import VectorDBEntry
1+
from ragbits.document_search.documents.document import DocumentType
2+
from ragbits.document_search.documents.element import Element
3+
from ragbits.document_search.vector_store.base import VectorDBEntry
44

55

66
def test_resolving_element_type():

packages/ragbits-document-search/tests/unit/test_simple_vector_store.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from pathlib import Path
22

3-
from ragbits_document_search.documents.document import DocumentMeta, DocumentType
4-
from ragbits_document_search.documents.element import TextElement
5-
from ragbits_document_search.documents.sources import LocalFileSource
6-
from ragbits_document_search.vector_store.in_memory import InMemoryVectorStore
3+
from ragbits.document_search.documents.document import DocumentMeta, DocumentType
4+
from ragbits.document_search.documents.element import TextElement
5+
from ragbits.document_search.documents.sources import LocalFileSource
6+
from ragbits.document_search.vector_store.in_memory import InMemoryVectorStore
77

88

99
async def test_simple_vector_store():

0 commit comments

Comments
 (0)