chatterer 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

chatterer/language_model.py

@@ -35,13 +35,11 @@ DEFAULT_IMAGE_DESCRIPTION_INSTRUCTION = "Provide a detailed description of all v
 DEFAULT_CODE_GENERATION_PROMPT = (
     "You are utilizing a Python code execution tool now.\n"
     "Your goal is to generate Python code that solves the task efficiently and appends both the code and its output to your context memory.\n"
-    "Since your context window is highly limited, type `pass` if no code execution is needed.\n"
     "\n"
     "To optimize tool efficiency, follow these guidelines:\n"
     "- Write concise, efficient code that directly serves the intended purpose.\n"
     "- Avoid unnecessary operations (e.g., excessive loops, recursion, or heavy computations).\n"
     "- Handle potential errors gracefully (e.g., using try-except blocks).\n"
-    "- Prevent excessive output by limiting print statements to essential information only (e.g., avoid printing large datasets).\n"
     "\n"
     "Return your response strictly in the following JSON format:\n"
     '{\n  "code": "<your_python_code_here>"\n}\n\n'
@@ -393,30 +391,30 @@ def _with_structured_output(
     return client.with_structured_output(schema=response_model, **structured_output_kwargs)  # pyright: ignore[reportUnknownVariableType, reportUnknownMemberType]
 
 
-def _add_message_last(messages: LanguageModelInput, prompt_to_add: str) -> LanguageModelInput:
-    if isinstance(messages, str):
-        messages += f"\n{prompt_to_add}"
-    elif isinstance(messages, Sequence):
-        messages = list(messages)
-        messages.append(SystemMessage(content=prompt_to_add))
-    else:
-        messages = messages.to_messages()
-        messages.append(SystemMessage(content=prompt_to_add))
-    return messages
-
-
-# def _add_message_first(messages: LanguageModelInput, prompt_to_add: str) -> LanguageModelInput:
+# def _add_message_last(messages: LanguageModelInput, prompt_to_add: str) -> LanguageModelInput:
 #     if isinstance(messages, str):
-#         messages = f"{prompt_to_add}\n{messages}"
+#         messages += f"\n{prompt_to_add}"
 #     elif isinstance(messages, Sequence):
 #         messages = list(messages)
-#         messages.insert(0, SystemMessage(content=prompt_to_add))
+#         messages.append(SystemMessage(content=prompt_to_add))
 #     else:
 #         messages = messages.to_messages()
-#         messages.insert(0, SystemMessage(content=prompt_to_add))
+#         messages.append(SystemMessage(content=prompt_to_add))
 #     return messages
 
 
+def _add_message_first(messages: LanguageModelInput, prompt_to_add: str) -> LanguageModelInput:
+    if isinstance(messages, str):
+        messages = f"{prompt_to_add}\n{messages}"
+    elif isinstance(messages, Sequence):
+        messages = list(messages)
+        messages.insert(0, SystemMessage(content=prompt_to_add))
+    else:
+        messages = messages.to_messages()
+        messages.insert(0, SystemMessage(content=prompt_to_add))
+    return messages
+
+
 def augment_prompt_for_toolcall(
     function_signatures: Iterable[FunctionSignature],
     messages: LanguageModelInput,
@@ -425,14 +423,14 @@ def augment_prompt_for_toolcall(
     function_reference_seperator: str = DEFAULT_FUNCTION_REFERENCE_SEPARATOR,
 ) -> LanguageModelInput:
     if function_signatures:
-        messages = _add_message_last(
+        messages = _add_message_first(
             messages=messages,
             prompt_to_add=FunctionSignature.as_prompt(
                 function_signatures, function_reference_prefix, function_reference_seperator
             ),
         )
     if prompt_for_code_invoke:
-        messages = _add_message_last(messages=messages, prompt_to_add=prompt_for_code_invoke)
+        messages = _add_message_first(messages=messages, prompt_to_add=prompt_for_code_invoke)
     return messages
 
 
@@ -450,16 +448,16 @@ def interactive_shell(
     stop: Optional[list[str]] = None,
     **kwargs: Any,
 ) -> None:
-    # Define the CodeExecutionDecision class using Pydantic
-
     from rich.console import Console
     from rich.prompt import Prompt
 
+    # 코드 실행 필요 여부를 판단하는 모델
     class IsCodeExecutionNeeded(BaseModel):
         is_code_execution_needed: bool = Field(
             description="Whether Python tool calling is needed to answer user query."
         )
 
+    # 추가 코드 실행 필요 여부를 판단하는 모델
     class IsFurtherCodeExecutionNeeded(BaseModel):
         review_on_code_execution: str = Field(description="Review on the code execution.")
         next_action: str = Field(description="Next action to take.")
@@ -467,17 +465,12 @@ def interactive_shell(
             description="Whether further Python tool calling is needed to answer user query."
         )
 
-    # Get default REPL tool if not provided.
-    # This tool namespace is persistent across multiple code executions.
+    # REPL 도구 초기화
     if repl_tool is None:
         repl_tool = get_default_repl_tool()
 
     function_signatures: list[FunctionSignature] = FunctionSignature.from_callable(additional_callables)
-
-    # Initialize Rich console
     console = Console()
-
-    # Initialize conversation context
     context: list[BaseMessage] = []
     if system_instruction:
         if isinstance(system_instruction, BaseMessage):
@@ -485,23 +478,22 @@ def interactive_shell(
         else:
             context.extend(system_instruction)
 
-    # Display welcome message
+    # 환영 메시지
     console.print("[bold blue]Welcome to the Interactive Chatterer Shell![/bold blue]")
     console.print("Type 'quit' or 'exit' to end the conversation.")
 
     while True:
-        # Get user input
+        # 사용자 입력 받기
         user_input = Prompt.ask("[bold green]You[/bold green]")
         if user_input.lower() in ["quit", "exit"]:
             console.print("[bold blue]Goodbye![/bold blue]")
             break
 
-        # Add user message to context
         context.append(HumanMessage(content=user_input))
 
-        # Determine if code execution is needed
+        # 코드 실행 필요 여부 판단
         decision = chatterer.generate_pydantic(
-            response_model=IsCodeExecutionNeeded,  # Use response_model instead of pydantic_model
+            response_model=IsCodeExecutionNeeded,
             messages=augment_prompt_for_toolcall(
                 function_signatures=function_signatures,
                 messages=context,
@@ -511,8 +503,8 @@ def interactive_shell(
             ),
         )
 
+        # 코드 실행 처리
         if decision.is_code_execution_needed:
-            # Execute code if needed
             code_result = chatterer.invoke_code_execution(
                 messages=context,
                 repl_tool=repl_tool,
@@ -530,8 +522,8 @@ def interactive_shell(
             else:
                 code_session_messages: list[BaseMessage] = []
                 while True:
-                    code_execution_message = SystemMessage(
-                        content=f"Executed code:\n```python\n{code_result.code}\n```\nOutput:\n{code_result.output}"
+                    code_execution_message = AIMessage(
+                        content=f"Executed code:\n```python\n{code_result.code}\n```\nOutput:\n{code_result.output}".strip()
                     )
                     code_session_messages.append(code_execution_message)
                     console.print("[bold yellow]Executed code:[/bold yellow]")
@@ -540,7 +532,7 @@ def interactive_shell(
                     console.print(code_result.output)
 
                     decision = chatterer.generate_pydantic(
-                        response_model=IsFurtherCodeExecutionNeeded,  # Use response_model instead of pydantic_model
+                        response_model=IsFurtherCodeExecutionNeeded,
                         messages=augment_prompt_for_toolcall(
                             function_signatures=function_signatures,
                             messages=context + code_session_messages,
@@ -549,31 +541,40 @@ def interactive_shell(
                             function_reference_seperator=function_reference_seperator,
                         ),
                     )
-                    review_on_code_execution = decision.review_on_code_execution
-                    next_action = decision.next_action
+                    review_on_code_execution = decision.review_on_code_execution.strip()
+                    next_action = decision.next_action.strip()
                     console.print("[bold blue]AI:[/bold blue]")
                     console.print(f"-[bold yellow]Review on code execution:[/bold yellow] {review_on_code_execution}")
                     console.print(f"-[bold yellow]Next Action:[/bold yellow] {next_action}")
                     code_session_messages.append(
                         AIMessage(
-                            content=f"- Review upon code execution: {decision.review_on_code_execution}\n- Next Action: {decision.next_action}"
+                            content=f"- Review upon code execution: {review_on_code_execution}\n- Next Action: {next_action}".strip()
                         )
                     )
                     if not decision.is_further_code_execution_needed:
                         tool_use_message = code_execution_message
                         break
         else:
-            # No code execution required
             tool_use_message = None
 
-        # Add system message to context
+        # 코드 실행 결과 컨텍스트에 추가
         if tool_use_message:
             context.append(tool_use_message)
 
-        # Generate and display chatbot response
-        response = chatterer.generate(messages=context)  # Use generate instead of generate_response
+        # AI 응답 스트리밍 출력
+        console.print("[bold blue]AI:[/bold blue] ", end="")
+        response = ""
+        for chunk in chatterer.generate_stream(messages=context):
+            response += chunk
+            console.print(chunk, end="")
+
+        # 전체 응답 처리 후 컨텍스트에 추가
+        lines = response.split("\n")
+        if lines:
+            lines[-1] = lines[-1].rstrip()  # 마지막 줄의 오른쪽 공백 제거
+        response = "\n".join(lines).strip()
         context.append(AIMessage(content=response))
-        console.print(f"[bold blue]AI:[/bold blue] {response}")
+        console.print()  # 응답 후 줄바꿈 추가
 
 
 if __name__ == "__main__":

chatterer/tools/youtube.py

@@ -57,7 +57,21 @@ def get_youtube_video_subtitle(video_id: str) -> str:
 
 
 def _get_video_id(suffix: str) -> str:
-    return next(iter(urllib.parse.parse_qs(urllib.parse.urlparse(suffix).query)["v"]), "")
+    urllib_parse_result = urllib.parse.urlparse(suffix)
+    if urllib_parse_result.path.startswith("/shorts/"):
+        # Fore shorts (/shorts/...) the video ID is in the path
+        parts = urllib_parse_result.path.split("/")
+        if len(parts) < 3:
+            print(f"Failed to get video ID from {suffix}")
+            return ""
+        return parts[2]
+
+    query: str = urllib.parse.urlparse(suffix).query
+    query_strings = urllib.parse.parse_qs(query)
+    if "v" not in query_strings:
+        print(f"Failed to get video ID from {suffix}")
+        return ""
+    return next(iter(query_strings["v"]), "")
 
 
 def _is_special_char(text: str) -> bool:

chatterer/utils/image.py

@@ -64,7 +64,7 @@ class Base64Image(BaseModel):
 
     IMAGE_TYPES: ClassVar[tuple[str, ...]] = tuple(map(str, get_args(ImageType)))
     IMAGE_PATTERN: ClassVar[re.Pattern[str]] = re.compile(
-        rf"data:image/({'|'.join(IMAGE_TYPES)});base64,[A-Za-z0-9+/]+={0, 2}$"
+        r"data:image/(" + "|".join(IMAGE_TYPES) + r");base64,([A-Za-z0-9+/]+={0,2})"
     )
 
     def __hash__(self) -> int:

{chatterer-0.1.10.dist-info → chatterer-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatterer
-Version: 0.1.10
+Version: 0.1.11
 Summary: The highest-level interface for various LLM APIs.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{chatterer-0.1.10.dist-info → chatterer-0.1.11.dist-info}/RECORD

@@ -1,5 +1,5 @@
 chatterer/__init__.py,sha256=BPgCQ6VWGBXSh8xJr_0bpM0hcOOUz0KoxcKxOd9GYyI,1388
-chatterer/language_model.py,sha256=qnVC5_W4IYM0y0o1PTYMGXUlblRv5fsRk0zIiL_vT3Q,24491
+chatterer/language_model.py,sha256=DX_mU855JHHqE0gdnieWZNOwX1BjIO4VK4EightRL3w,24353
 chatterer/messages.py,sha256=OtbZ3two0LUQ4PXES97FDIBUSO3IcMHdFV1VFkDL2mI,229
 chatterer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chatterer/strategies/__init__.py,sha256=SdOggbmHpw4f7Njwy-T8q64e91OLOUp1k0a0ozZd4qI,221
@@ -7,7 +7,7 @@ chatterer/strategies/atom_of_thoughts.py,sha256=CygOCLu5vLk-fzY9O-iE3qLShfjD7iY4
 chatterer/strategies/base.py,sha256=b2gMPqodp97OP1dkHfj0UqixjdjVhmTw_V5qJ7i2S6g,427
 chatterer/tools/__init__.py,sha256=hmWIuLJWotGQodL__i4LLbHdXe7Nl5uKHqNke9tHMro,705
 chatterer/tools/convert_to_text.py,sha256=kBqxCJ0IoiAw2eiPYqep_SPZm-TtYKF7mdACLsWQUuI,15915
-chatterer/tools/youtube.py,sha256=5hwASZWA92d_7Y5RqlCK2tULRBQx8bGnE_0NCnvaKi0,5499
+chatterer/tools/youtube.py,sha256=GhyE05JBF_eos01A_N-X5tZv4wQJ--IjErBbEBeNBpQ,6037
 chatterer/tools/citation_chunking/__init__.py,sha256=gG7Fnkkp28UpcWMbfMY_4gqzZSZ8QzlhalHBoeoq7K0,82
 chatterer/tools/citation_chunking/chunks.py,sha256=50Dpa43RaYftlNox8tM1qI8htZ3_AJ9Uyyn02WsmxYk,2173
 chatterer/tools/citation_chunking/citation_chunker.py,sha256=yx5O9pUkowlNcFyyNf7f3sbq7-CV8AXOzFnviDldPR8,4894
@@ -20,8 +20,8 @@ chatterer/tools/webpage_to_markdown/playwright_bot.py,sha256=yP0KixYZNQ4Kn_ZCFDI
 chatterer/tools/webpage_to_markdown/utils.py,sha256=ZLUU94imYciEdynD2K7Dmcsbt8BVQTaOP56Ba6DAFvk,12593
 chatterer/utils/__init__.py,sha256=8nzpFJKU_wSRPH6LBP6HRBotPMrSl_VO9UlmFprTrK0,334
 chatterer/utils/code_agent.py,sha256=UaWdeGzJMPzRSFy9yrxuveBJsvOPSa0te6OuE18bees,5143
-chatterer/utils/image.py,sha256=F3_D1677UDFlgp-UQBS_ChkNODzf_VOfjYNSUi02MaI,10852
-chatterer-0.1.10.dist-info/METADATA,sha256=qPx7b41yUvBG0XFH4ra89LIyOSUZUo_8gZ-adVkTKME,4458
-chatterer-0.1.10.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-chatterer-0.1.10.dist-info/top_level.txt,sha256=7nSQKP0bHxPRc7HyzdbKsJdkvPgYD0214o6slRizv9s,10
-chatterer-0.1.10.dist-info/RECORD,,
+chatterer/utils/image.py,sha256=1imiyq6TB9NIIGx3zAA2OwMWuXlifYIAjwfWRWa4WIM,10858
+chatterer-0.1.11.dist-info/METADATA,sha256=S3hRkxG1DlFc_NGrra1xhniiCDDVoVrow2N96OJy8i0,4458
+chatterer-0.1.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+chatterer-0.1.11.dist-info/top_level.txt,sha256=7nSQKP0bHxPRc7HyzdbKsJdkvPgYD0214o6slRizv9s,10
+chatterer-0.1.11.dist-info/RECORD,,

{chatterer-0.1.10.dist-info → chatterer-0.1.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any