Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Add support for custom streaming callback #971

Merged
merged 1 commit into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion embedchain/apps/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from embedchain.embedder.base import BaseEmbedder
from embedchain.embedder.openai import OpenAIEmbedder
from embedchain.factory import EmbedderFactory, LlmFactory, VectorDBFactory
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable
from embedchain.llm.base import BaseLlm
from embedchain.llm.openai import OpenAILlm
from embedchain.utils import validate_yaml_config
Expand Down
4 changes: 2 additions & 2 deletions embedchain/bots/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from embedchain import Pipeline as App
from embedchain.config import AddConfig, BaseLlmConfig, PipelineConfig
from embedchain.embedder.openai import OpenAIEmbedder
from embedchain.helper.json_serializable import (JSONSerializable,
register_deserializable)
from embedchain.helpers.json_serializable import (JSONSerializable,
register_deserializable)
from embedchain.llm.openai import OpenAILlm
from embedchain.vectordb.chroma import ChromaDB

Expand Down
2 changes: 1 addition & 1 deletion embedchain/bots/discord.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

Check warning on line 5 in embedchain/bots/discord.py

View check run for this annotation

Codecov / codecov/patch

embedchain/bots/discord.py#L5

Added line #L5 was not covered by tests

from .base import BaseBot

Expand Down
2 changes: 1 addition & 1 deletion embedchain/bots/poe.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
from typing import List, Optional

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

from .base import BaseBot

Expand Down
2 changes: 1 addition & 1 deletion embedchain/bots/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys

from embedchain import App
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

Check warning on line 8 in embedchain/bots/slack.py

View check run for this annotation

Codecov / codecov/patch

embedchain/bots/slack.py#L8

Added line #L8 was not covered by tests

from .base import BaseBot

Expand Down
2 changes: 1 addition & 1 deletion embedchain/bots/whatsapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import signal
import sys

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

from .base import BaseBot

Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/base_chunker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import hashlib

from embedchain.helper.json_serializable import JSONSerializable
from embedchain.helpers.json_serializable import JSONSerializable
from embedchain.models.data_type import DataType


Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/common_chunker.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/discourse.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/docs_site.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/docx_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/gmail.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/mdx.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

Check warning on line 7 in embedchain/chunkers/mysql.py

View check run for this annotation

Codecov / codecov/patch

embedchain/chunkers/mysql.py#L7

Added line #L7 was not covered by tests


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/notion.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/pdf_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/postgres.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/qna_pair.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/sitemap.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/substack.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

Check warning on line 7 in embedchain/chunkers/substack.py

View check run for this annotation

Codecov / codecov/patch

embedchain/chunkers/substack.py#L7

Added line #L7 was not covered by tests


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/text.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/unstructured_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

Check warning on line 7 in embedchain/chunkers/unstructured_file.py

View check run for this annotation

Codecov / codecov/patch

embedchain/chunkers/unstructured_file.py#L7

Added line #L7 was not covered by tests


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/web_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/chunkers/youtube_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from embedchain.chunkers.base_chunker import BaseChunker
from embedchain.config.add_config import ChunkerConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/add_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Callable, Optional

from embedchain.config.base_config import BaseConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/apps/app_config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Optional

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

from .base_app_config import BaseAppConfig

Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/apps/base_app_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Optional

from embedchain.config.base_config import BaseConfig
from embedchain.helper.json_serializable import JSONSerializable
from embedchain.helpers.json_serializable import JSONSerializable
from embedchain.vectordb.base import BaseVectorDB


Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/base_config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any, Dict

from embedchain.helper.json_serializable import JSONSerializable
from embedchain.helpers.json_serializable import JSONSerializable


class BaseConfig(JSONSerializable):
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/embedder/base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Optional

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
8 changes: 6 additions & 2 deletions embedchain/config/llm/base.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import re
from string import Template
from typing import Any, Dict, Optional
from typing import Any, Dict, List, Optional

from embedchain.config.base_config import BaseConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

DEFAULT_PROMPT = """
Use the following pieces of context to answer the query at the end.
Expand Down Expand Up @@ -68,6 +68,7 @@ def __init__(
system_prompt: Optional[str] = None,
where: Dict[str, Any] = None,
query_type: Optional[str] = None,
callbacks: Optional[List] = None,
):
"""
Initializes a configuration class instance for the LLM.
Expand Down Expand Up @@ -98,6 +99,8 @@ def __init__(
:type system_prompt: Optional[str], optional
:param where: A dictionary of key-value pairs to filter the database results., defaults to None
:type where: Dict[str, Any], optional
:param callbacks: Langchain callback functions to use, defaults to None
:type callbacks: Optional[List], optional
:raises ValueError: If the template is not valid as template should
contain $context and $query (and optionally $history)
:raises ValueError: Stream is not boolean
Expand All @@ -113,6 +116,7 @@ def __init__(
self.deployment_name = deployment_name
self.system_prompt = system_prompt
self.query_type = query_type
self.callbacks = callbacks

if type(template) is str:
template = Template(template)
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/pipeline_config.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Optional

from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable

from .apps.base_app_config import BaseAppConfig

Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/chroma.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Optional

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/elasticsearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Dict, List, Optional, Union

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/opensearch.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, Optional, Tuple

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/pinecone.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, Optional

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/qdrant.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, Optional

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/weaviate.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Dict, Optional

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
2 changes: 1 addition & 1 deletion embedchain/config/vectordb/zilliz.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Optional

from embedchain.config.vectordb.base import BaseVectorDbConfig
from embedchain.helper.json_serializable import register_deserializable
from embedchain.helpers.json_serializable import register_deserializable


@register_deserializable
Expand Down
Loading
Loading