PyPI - chainlit - Versions diffs - 1.0.0rc3__py3-none-any.whl → 1.0.100__py3-none-any.whl - Mend

chainlit 1.0.0rc3py3-none-any.whl → 1.0.100py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of chainlit might be problematic. Click here for more details.

Files changed (30) hide show

chainlit/__init__.py +14 -1
chainlit/auth.py +4 -3
chainlit/config.py +2 -6
chainlit/data/__init__.py +97 -24
chainlit/emitter.py +9 -5
chainlit/frontend/dist/assets/index-c4f40824.js +723 -0
chainlit/frontend/dist/assets/{react-plotly-c9578a93.js → react-plotly-259d6961.js} +1 -1
chainlit/frontend/dist/index.html +1 -1
chainlit/haystack/callbacks.py +32 -6
chainlit/langchain/callbacks.py +8 -6
chainlit/llama_index/callbacks.py +13 -5
chainlit/message.py +1 -1
chainlit/oauth_providers.py +67 -0
chainlit/playground/config.py +2 -0
chainlit/playground/provider.py +1 -1
chainlit/playground/providers/__init__.py +1 -0
chainlit/playground/providers/anthropic.py +1 -1
chainlit/playground/providers/langchain.py +8 -7
chainlit/playground/providers/vertexai.py +51 -6
chainlit/server.py +35 -15
chainlit/session.py +5 -1
chainlit/socket.py +56 -18
chainlit/step.py +4 -4
chainlit/telemetry.py +2 -6
chainlit/types.py +1 -1
{chainlit-1.0.0rc3.dist-info → chainlit-1.0.100.dist-info}/METADATA +3 -3
{chainlit-1.0.0rc3.dist-info → chainlit-1.0.100.dist-info}/RECORD +29 -29
chainlit/frontend/dist/assets/index-15bb372a.js +0 -697
{chainlit-1.0.0rc3.dist-info → chainlit-1.0.100.dist-info}/WHEEL +0 -0
{chainlit-1.0.0rc3.dist-info → chainlit-1.0.100.dist-info}/entry_points.txt +0 -0

chainlit/frontend/dist/index.html CHANGED Viewed

@@ -20,7 +20,7 @@
     <script>
       const global = globalThis;
     </script>
-    <script type="module" crossorigin src="/assets/index-15bb372a.js"></script>
+    <script type="module" crossorigin src="/assets/index-c4f40824.js"></script>
     <link rel="stylesheet" href="/assets/index-d088547c.css">
   </head>
   <body>

chainlit/haystack/callbacks.py CHANGED Viewed

@@ -1,9 +1,11 @@
 from datetime import datetime
 from typing import Any, Generic, List, Optional, TypeVar
+import re
 from chainlit.context import context
 from chainlit.step import Step
 from chainlit.sync import run_sync
+from chainlit import Message
 from haystack.agents import Agent, Tool
 from haystack.agents.agent_step import AgentStep
@@ -34,7 +36,7 @@ class HaystackAgentCallbackHandler:
     stack: Stack[Step]
     last_step: Optional[Step]
-    def __init__(self, agent: Agent):
+    def __init__(self, agent: Agent, stream_final_answer: bool = False, stream_final_answer_agent_name: str = 'Agent'):
         agent.callback_manager.on_agent_start += self.on_agent_start
         agent.callback_manager.on_agent_step += self.on_agent_step
         agent.callback_manager.on_agent_finish += self.on_agent_finish
@@ -44,10 +46,20 @@ class HaystackAgentCallbackHandler:
         agent.tm.callback_manager.on_tool_finish += self.on_tool_finish
         agent.tm.callback_manager.on_tool_error += self.on_tool_error
+        self.final_answer_pattern = agent.final_answer_pattern
+        self.stream_final_answer = stream_final_answer
+        self.stream_final_answer_agent_name = stream_final_answer_agent_name
     def on_agent_start(self, **kwargs: Any) -> None:
         # Prepare agent step message for streaming
         self.agent_name = kwargs.get("name", "Agent")
         self.stack = Stack[Step]()
+        if self.stream_final_answer:
+            self.final_stream = Message(author=self.stream_final_answer_agent_name, content="")
+            self.last_tokens: List[str] = []
+            self.answer_reached = False
         root_message = context.session.root_message
         parent_id = root_message.id if root_message else None
         run_step = Step(name=self.agent_name, type="run", parent_id=parent_id)
@@ -59,10 +71,11 @@ class HaystackAgentCallbackHandler:
         self.stack.push(run_step)
     def on_agent_finish(self, agent_step: AgentStep, **kwargs: Any) -> None:
-        run_step = self.stack.pop()
-        run_step.end = datetime.utcnow().isoformat()
-        run_step.output = agent_step.prompt_node_response
-        run_sync(run_step.update())
+        if self.last_step:
+            run_step = self.last_step
+            run_step.end = datetime.utcnow().isoformat()
+            run_step.output = agent_step.prompt_node_response
+            run_sync(run_step.update())
     # This method is called when a step has finished
     def on_agent_step(self, agent_step: AgentStep, **kwargs: Any) -> None:
@@ -77,11 +90,24 @@ class HaystackAgentCallbackHandler:
         if not agent_step.is_last():
             # Prepare step for next agent step
-            step = Step(name=self.agent_name, parent_id=self.stack.peek().id)
+            step = Step(name=self.agent_name, parent_id=self.last_step.id)
             self.stack.push(step)
     def on_new_token(self, token, **kwargs: Any) -> None:
         # Stream agent step tokens
+        if self.stream_final_answer:
+            if self.answer_reached:
+                run_sync(self.final_stream.stream_token(token))
+            else:
+                self.last_tokens.append(token)
+                last_tokens_concat = ''.join(self.last_tokens)
+                final_answer_match = re.search(self.final_answer_pattern, last_tokens_concat)
+                if final_answer_match:
+                    self.answer_reached = True
+                    run_sync(self.final_stream.stream_token(final_answer_match.group(1)))
         run_sync(self.stack.peek().stream_token(token))
     def on_tool_start(self, tool_input: str, tool: Tool, **kwargs: Any) -> None:

chainlit/langchain/callbacks.py CHANGED Viewed

@@ -6,11 +6,11 @@ from chainlit.context import context_var
 from chainlit.message import Message
 from chainlit.playground.providers.openai import stringify_function_call
 from chainlit.step import Step, TrueStepType
-from chainlit_client import ChatGeneration, CompletionGeneration, GenerationMessage
 from langchain.callbacks.tracers.base import BaseTracer
 from langchain.callbacks.tracers.schemas import Run
 from langchain.schema import BaseMessage
 from langchain.schema.output import ChatGenerationChunk, GenerationChunk
+from literalai import ChatGeneration, CompletionGeneration, GenerationMessage
 DEFAULT_ANSWER_PREFIX_TOKENS = ["Final", "Answer", ":"]
@@ -388,11 +388,13 @@ class LangchainTracer(BaseTracer, GenerationHelper, FinalStreamHelper):
         self.steps = {}
         self.parent_id_map = {}
         self.ignored_runs = set()
-        self.root_parent_id = (
-            self.context.session.root_message.id
-            if self.context.session.root_message
-            else None
-        )
+        if self.context.current_step:
+            self.root_parent_id = self.context.current_step.id
+        elif self.context.session.root_message:
+            self.root_parent_id = self.context.session.root_message.id
+        else:
+            self.root_parent_id = None
         if to_ignore is None:
             self.to_ignore = DEFAULT_TO_IGNORE

chainlit/llama_index/callbacks.py CHANGED Viewed

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Optional
 from chainlit.context import context_var
 from chainlit.element import Text
 from chainlit.step import Step, StepType
-from chainlit_client import ChatGeneration, CompletionGeneration, GenerationMessage
+from literalai import ChatGeneration, CompletionGeneration, GenerationMessage
 from llama_index.callbacks import TokenCountingHandler
 from llama_index.callbacks.schema import CBEventType, EventPayload
 from llama_index.llms.base import ChatMessage, ChatResponse, CompletionResponse
@@ -36,14 +36,19 @@ class LlamaIndexCallbackHandler(TokenCountingHandler):
         )
         self.context = context_var.get()
+        if self.context.current_step:
+            self.root_parent_id = self.context.current_step.id
+        elif self.context.session.root_message:
+            self.root_parent_id = self.context.session.root_message.id
+        else:
+            self.root_parent_id = None
         self.steps = {}
     def _get_parent_id(self, event_parent_id: Optional[str] = None) -> Optional[str]:
         if event_parent_id and event_parent_id in self.steps:
             return event_parent_id
-        if root_message := self.context.session.root_message:
-            return root_message.id
-        return None
+        return self.root_parent_id
     def _restore_context(self) -> None:
         """Restore Chainlit context in the current thread
@@ -113,7 +118,10 @@ class LlamaIndexCallbackHandler(TokenCountingHandler):
                     [f"Source {idx}" for idx, _ in enumerate(sources)]
                 )
                 step.elements = [
-                    Text(name=f"Source {idx}", content=source.node.get_text())
+                    Text(
+                        name=f"Source {idx}",
+                        content=source.node.get_text() or "Empty node",
+                    )
                     for idx, source in enumerate(sources)
                 ]
                 step.output = f"Retrieved the following sources: {source_refs}"

chainlit/message.py CHANGED Viewed

@@ -22,7 +22,7 @@ from chainlit.types import (
     AskSpec,
     FileDict,
 )
-from chainlit_client.step import MessageStepType
+from literalai.step import MessageStepType
 class MessageBase(ABC):

chainlit/oauth_providers.py CHANGED Viewed

@@ -409,6 +409,72 @@ class DescopeOAuthProvider(OAuthProvider):
             return (descope_user, user)
+class AWSCognitoOAuthProvider(OAuthProvider):
+    id = "aws-cognito"
+    env = [
+        "OAUTH_COGNITO_CLIENT_ID",
+        "OAUTH_COGNITO_CLIENT_SECRET",
+        "OAUTH_COGNITO_DOMAIN",
+    ]
+    authorize_url = f"https://{os.environ.get('OAUTH_COGNITO_DOMAIN')}/login"
+    token_url = f"https://{os.environ.get('OAUTH_COGNITO_DOMAIN')}/oauth2/token"
+    def __init__(self):
+        self.client_id = os.environ.get("OAUTH_COGNITO_CLIENT_ID")
+        self.client_secret = os.environ.get("OAUTH_COGNITO_CLIENT_SECRET")
+        self.authorize_params = {
+            "response_type": "code",
+            "client_id": self.client_id,
+            "scope": "openid profile email",
+        }
+    async def get_token(self, code: str, url: str):
+        payload = {
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+            "code": code,
+            "grant_type": "authorization_code",
+            "redirect_uri": url,
+        }
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
+                self.token_url,
+                data=payload,
+            )
+            response.raise_for_status()
+            json = response.json()
+            token = json.get("access_token")
+            if not token:
+                raise HTTPException(
+                    status_code=400, detail="Failed to get the access token"
+                )
+            return token
+    async def get_user_info(self, token: str):
+        user_info_url = (
+            f"https://{os.environ.get('OAUTH_COGNITO_DOMAIN')}/oauth2/userInfo"
+        )
+        async with httpx.AsyncClient() as client:
+            response = await client.get(
+                user_info_url,
+                headers={"Authorization": f"Bearer {token}"},
+            )
+            response.raise_for_status()
+            cognito_user = response.json()
+            # Customize user metadata as needed
+            user = User(
+                identifier=cognito_user["email"],
+                metadata={
+                    "image": cognito_user.get("picture", ""),
+                    "provider": "aws-cognito",
+                },
+            )
+            return (cognito_user, user)
 providers = [
     GithubOAuthProvider(),
     GoogleOAuthProvider(),
@@ -416,6 +482,7 @@ providers = [
     OktaOAuthProvider(),
     Auth0OAuthProvider(),
     DescopeOAuthProvider(),
+    AWSCognitoOAuthProvider(),
 ]

chainlit/playground/config.py CHANGED Viewed

@@ -9,6 +9,7 @@ from chainlit.playground.providers import (
     OpenAI,
     ChatVertexAI,
     GenerationVertexAI,
+    Gemini,
 )
 providers = {
@@ -19,6 +20,7 @@ providers = {
     Anthropic.id: Anthropic,
     ChatVertexAI.id: ChatVertexAI,
     GenerationVertexAI.id: GenerationVertexAI,
+    Gemini.id: Gemini,
 }  # type: Dict[str, BaseProvider]

chainlit/playground/provider.py CHANGED Viewed

@@ -4,8 +4,8 @@ from typing import Any, Dict, List, Optional, Union
 from chainlit.config import config
 from chainlit.telemetry import trace_event
 from chainlit.types import GenerationRequest
-from chainlit_client import BaseGeneration, ChatGeneration, GenerationMessage
 from fastapi import HTTPException
+from literalai import BaseGeneration, ChatGeneration, GenerationMessage
 from pydantic.dataclasses import dataclass
 from chainlit import input_widget

chainlit/playground/providers/__init__.py CHANGED Viewed

@@ -9,4 +9,5 @@ from .openai import (
 from .vertexai import (
     ChatVertexAI,
     GenerationVertexAI,
+    Gemini
 )

chainlit/playground/providers/anthropic.py CHANGED Viewed

@@ -1,8 +1,8 @@
 from chainlit.input_widget import Select, Slider, Tags
 from chainlit.playground.provider import BaseProvider
-from chainlit_client import GenerationMessage
 from fastapi import HTTPException
 from fastapi.responses import StreamingResponse
+from literalai import GenerationMessage
 class AnthropicProvider(BaseProvider):

chainlit/playground/providers/langchain.py CHANGED Viewed

@@ -1,9 +1,10 @@
-from typing import Union
+from typing import List, Union
+from chainlit.input_widget import InputWidget
 from chainlit.playground.provider import BaseProvider
 from chainlit.sync import make_async
-from chainlit_client import GenerationMessage
 from fastapi.responses import StreamingResponse
+from literalai import GenerationMessage
 class LangchainGenericProvider(BaseProvider):
@@ -18,13 +19,14 @@ class LangchainGenericProvider(BaseProvider):
         id: str,
         name: str,
         llm: Union[LLM, BaseChatModel],
+        inputs: List[InputWidget] = [],
         is_chat: bool = False,
     ):
         super().__init__(
             id=id,
             name=name,
             env_vars={},
-            inputs=[],
+            inputs=inputs,
             is_chat=is_chat,
         )
         self.llm = llm
@@ -65,10 +67,9 @@ class LangchainGenericProvider(BaseProvider):
         messages = self.create_generation(request)
-        stream = make_async(self.llm.stream)
-        result = await stream(
-            input=messages,
+        # https://github.com/langchain-ai/langchain/issues/14980
+        result = await make_async(self.llm.stream)(
+            input=messages, **request.generation.settings
         )
         def create_event_stream():

chainlit/playground/providers/vertexai.py CHANGED Viewed

@@ -33,10 +33,10 @@ class ChatVertexAIProvider(BaseProvider):
         self.validate_env(request=request)
-        llm_settings = request.prompt.settings
+        llm_settings = request.generation.settings
         self.require_settings(llm_settings)
-        prompt = self.create_prompt(request)
+        messages = self.create_generation(request)
         model_name = llm_settings["model"]
         if model_name.startswith("chat-"):
             model = ChatModel.from_pretrained(model_name)
@@ -52,7 +52,7 @@ class ChatVertexAIProvider(BaseProvider):
         async def create_event_stream():
             for response in await cl.make_async(chat.send_message_streaming)(
-                prompt[0].formatted, **llm_settings
+                messages, **llm_settings
             ):
                 yield response.text
@@ -66,10 +66,10 @@ class GenerationVertexAIProvider(BaseProvider):
         self.validate_env(request=request)
-        llm_settings = request.prompt.settings
+        llm_settings = request.generation.settings
         self.require_settings(llm_settings)
-        prompt = self.create_prompt(request)
+        messages = self.create_generation(request)
         model_name = llm_settings["model"]
         if model_name.startswith("text-"):
             model = TextGenerationModel.from_pretrained(model_name)
@@ -84,13 +84,42 @@ class GenerationVertexAIProvider(BaseProvider):
         async def create_event_stream():
             for response in await cl.make_async(model.predict_streaming)(
-                prompt, **llm_settings
+                messages, **llm_settings
             ):
                 yield response.text
         return StreamingResponse(create_event_stream())
+class GeminiProvider(BaseProvider):
+    async def create_completion(self, request):
+        await super().create_completion(request)
+        from vertexai.preview.generative_models import GenerativeModel
+        from google.cloud import aiplatform
+        import os
+        self.validate_env(request=request)
+        llm_settings = request.generation.settings
+        self.require_settings(llm_settings)
+        messages = self.create_generation(request)
+        aiplatform.init(  # TODO: remove this when Gemini is released in all the regions
+            project=os.environ["GCP_PROJECT_ID"],
+            location='us-central1',
+        )
+        model = GenerativeModel(llm_settings["model"])
+        del llm_settings["model"]
+        async def create_event_stream():
+            for response in await cl.make_async(model.generate_content)(
+                messages, stream=True, generation_config=llm_settings
+            ):
+                yield response.candidates[0].content.parts[0].text
+        return StreamingResponse(create_event_stream())
 gcp_env_vars = {"google_application_credentials": "GOOGLE_APPLICATION_CREDENTIALS"}
 ChatVertexAI = ChatVertexAIProvider(
@@ -124,3 +153,19 @@ GenerationVertexAI = GenerationVertexAIProvider(
     ],
     is_chat=False,
 )
+Gemini = GeminiProvider(
+    id="gemini",
+    env_vars=gcp_env_vars,
+    name="Gemini",
+    inputs=[
+        Select(
+            id="model",
+            label="Model",
+            values=["gemini-pro", "gemini-pro-vision"],
+            initial_value="gemini-pro",
+        ),
+        *vertexai_common_inputs,
+    ],
+    is_chat=False,
+)

chainlit/server.py CHANGED Viewed

@@ -42,7 +42,16 @@ from chainlit.types import (
     UpdateFeedbackRequest,
 )
 from chainlit.user import PersistedUser, User
-from fastapi import Depends, FastAPI, HTTPException, Query, Request, UploadFile, status
+from fastapi import (
+    Depends,
+    FastAPI,
+    HTTPException,
+    Query,
+    Request,
+    Response,
+    UploadFile,
+    status,
+)
 from fastapi.responses import FileResponse, HTMLResponse, JSONResponse, RedirectResponse
 from fastapi.security import OAuth2PasswordRequestForm
 from fastapi.staticfiles import StaticFiles
@@ -257,13 +266,24 @@ async def login(form_data: OAuth2PasswordRequestForm = Depends()):
         )
     access_token = create_jwt(user)
     if data_layer := get_data_layer():
-        await data_layer.create_user(user)
+        try:
+            await data_layer.create_user(user)
+        except Exception as e:
+            logger.error(f"Error creating user: {e}")
     return {
         "access_token": access_token,
         "token_type": "bearer",
     }
+@app.post("/logout")
+async def logout(request: Request, response: Response):
+    if config.code.on_logout:
+        return await config.code.on_logout(request, response)
+    return {"success": True}
 @app.post("/auth/header")
 async def header_auth(request: Request):
     if not config.code.header_auth_callback:
@@ -282,7 +302,11 @@ async def header_auth(request: Request):
     access_token = create_jwt(user)
     if data_layer := get_data_layer():
-        await data_layer.create_user(user)
+        try:
+            await data_layer.create_user(user)
+        except Exception as e:
+            logger.error(f"Error creating user: {e}")
     return {
         "access_token": access_token,
         "token_type": "bearer",
@@ -318,8 +342,9 @@ async def oauth_login(provider_id: str, request: Request):
         url=f"{provider.authorize_url}?{params}",
     )
     samesite = os.environ.get("CHAINLIT_COOKIE_SAMESITE", "lax")  # type: Any
+    secure = samesite.lower() == 'none'
     response.set_cookie(
-        "oauth_state", random, httponly=True, samesite=samesite, max_age=3 * 60
+        "oauth_state", random, httponly=True, samesite=samesite, secure=secure, max_age=3 * 60
     )
     return response
@@ -389,7 +414,10 @@ async def oauth_callback(
     access_token = create_jwt(user)
     if data_layer := get_data_layer():
-        await data_layer.create_user(user)
+        try:
+            await data_layer.create_user(user)
+        except Exception as e:
+            logger.error(f"Error creating user: {e}")
     params = urllib.parse.urlencode(
         {
@@ -471,12 +499,12 @@ async def update_feedback(
     """Update the human feedback for a particular message."""
     data_layer = get_data_layer()
     if not data_layer:
-        raise HTTPException(status_code=400, detail="Data persistence is not enabled")
+        raise HTTPException(status_code=500, detail="Data persistence is not enabled")
     try:
         feedback_id = await data_layer.upsert_feedback(feedback=update.feedback)
     except Exception as e:
-        raise HTTPException(detail=str(e), status_code=401)
+        raise HTTPException(detail=str(e), status_code=500)
     return JSONResponse(content={"success": True, "feedbackId": feedback_id})
@@ -599,7 +627,6 @@ async def upload_file(
 async def get_file(
     file_id: str,
     session_id: Optional[str] = None,
-    token: Optional[str] = None,
 ):
     from chainlit.session import WebsocketSession
@@ -611,13 +638,6 @@ async def get_file(
             detail="Session not found",
         )
-    if current_user := await get_current_user(token or ""):
-        if not session.user or session.user.identifier != current_user.identifier:
-            raise HTTPException(
-                status_code=401,
-                detail="You are not authorized to upload files for this session",
-            )
     if file_id in session.files:
         file = session.files[file_id]
         return FileResponse(file["path"], media_type=file["type"])

chainlit/session.py CHANGED Viewed

@@ -5,6 +5,7 @@ import uuid
 from typing import TYPE_CHECKING, Any, Callable, Deque, Dict, List, Optional, Union
 import aiofiles
+from chainlit.logger import logger
 if TYPE_CHECKING:
     from chainlit.message import Message
@@ -242,7 +243,10 @@ class WebsocketSession(BaseSession):
         for method_name, queue in self.thread_queues.items():
             while queue:
                 method, self, args, kwargs = queue.popleft()
-                await method(self, *args, **kwargs)
+                try:
+                    await method(self, *args, **kwargs)
+                except Exception as e:
+                    logger.error(f"Error while flushing {method_name}: {e}")
     @classmethod
     def get(cls, socket_id: str):

chainlit 1.0.0rc3__py3-none-any.whl → 1.0.100__py3-none-any.whl

Potentially problematic release.

chainlit 1.0.0rc3py3-none-any.whl → 1.0.100py3-none-any.whl