allow ruff and mypy to rule the world

.bumpversion.cfg

@@ -1,22 +1,22 @@
 [bumpversion]
-current_version = 1.0.0-alpha.32
+current_version = 1.0.0-alpha.34
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<prerelease>[a-zA-Z]+))?(\.(?P<release>\d+))?
-serialize =
+serialize = 
 	{major}.{minor}.{patch}-{prerelease}.{release}
 	{major}.{minor}.{patch}
 
 [bumpversion:part:prerelease]
 optional_value = gamma
-values =
+values = 
 	alpha
 	beta
 	gamma
 
 [bumpversion:part:release]
 first_value = 1
-values =
+values = 
 	1
 	2
 	3

.pre-commit-config.yaml

@@ -7,7 +7,6 @@ repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v3.4.0
       hooks:
-          - id: trailing-whitespace
           - id: end-of-file-fixer
           - id: check-merge-conflict
           - id: check-yaml

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.0-alpha.32]
+## [1.0.0-alpha.34]
 
 ### Added
 

chatlab/__init__.py

@@ -21,7 +21,16 @@
 from ._version import __version__
 from .chat import Chat
 from .decorators import ChatlabMetadata, expose_exception_to_llm
-from .messaging import ai, assistant, assistant_function_call, function_result, human, narrate, system, user
+from .messaging import (
+    ai,
+    assistant,
+    assistant_function_call,
+    function_result,
+    human,
+    narrate,
+    system,
+    user,
+)
 from .registry import FunctionRegistry
 from .views.markdown import Markdown
 

chatlab/_version.py

@@ -1 +1 @@
-__version__ = "1.0.0-alpha.32"
+__version__ = "1.0.0-alpha.34"

chatlab/builtins/noteable.py

@@ -102,9 +102,7 @@ async def create(cls, file_name=None, token=None, file_id=None, project_id=None)
         # We have to track the kernel_session for now
         kernel_session = await api_client.launch_kernel(file_id)
 
-        cn = NotebookClient(
-            api_client, rtu_client, file_id=file_id, kernel_session=kernel_session
-        )
+        cn = NotebookClient(api_client, rtu_client, file_id=file_id, kernel_session=kernel_session)
 
         return cn
 
@@ -167,9 +165,7 @@ async def create_cell(
             )
 
         if cell is None:
-            return (
-                f"Unknown cell type {cell_type}. Valid types are: markdown, code, sql."
-            )
+            return f"Unknown cell type {cell_type}. Valid types are: markdown, code, sql."
 
         logger.info(f"Adding cell {cell_id} to notebook")
         cell = await rtu_client.add_cell(cell=cell, after_id=after_cell_id)
@@ -230,9 +226,7 @@ async def update_cell(
 
     async def _get_llm_friendly_outputs(self, output_collection_id: uuid.UUID):
         """Get the outputs for a given output collection ID."""
-        output_collection = await self.api_client.get_output_collection(
-            output_collection_id
-        )
+        output_collection = await self.api_client.get_output_collection(output_collection_id)
 
         outputs = output_collection.outputs
 
@@ -252,9 +246,7 @@ async def _get_llm_friendly_outputs(self, output_collection_id: uuid.UUID):
         return llm_friendly_outputs
 
     async def _extract_llm_plain(self, output: KernelOutput):
-        resp = await self.api_client.client.get(
-            f"/outputs/{output.id}", params={"mimetype": "text/llm+plain"}
-        )
+        resp = await self.api_client.client.get(f"/outputs/{output.id}", params={"mimetype": "text/llm+plain"})
         resp.raise_for_status()
 
         output_for_llm = KernelOutput.parse_obj(resp.json())
@@ -265,9 +257,7 @@ async def _extract_llm_plain(self, output: KernelOutput):
         return output_for_llm.content.raw
 
     async def _extract_specific_mediatype(self, output: KernelOutput, mimetype: str):
-        resp = await self.api_client.client.get(
-            f"/outputs/{output.id}", params={"mimetype": mimetype}
-        )
+        resp = await self.api_client.client.get(f"/outputs/{output.id}", params={"mimetype": mimetype})
         resp.raise_for_status()
 
         output_for_llm = KernelOutput.parse_obj(resp.json())
@@ -330,9 +320,7 @@ async def _get_llm_friendly_output(self, output: KernelOutput):
 
         for format in formats_for_llm:
             if format in mimetypes:
-                resp = await self.api_client.client.get(
-                    f"/outputs/{output.id}?mimetype={format}"
-                )
+                resp = await self.api_client.client.get(f"/outputs/{output.id}?mimetype={format}")
                 resp.raise_for_status()
                 if resp.status_code == 200:
                     return
@@ -421,9 +409,7 @@ async def get_cell(self, cell_id: str, with_outputs: bool = True):
             response += cell.source
             return response
 
-        source_type = rtu_client.builder.nb.metadata.get("kernelspec", {}).get(
-            "language", ""
-        )
+        source_type = rtu_client.builder.nb.metadata.get("kernelspec", {}).get("language", "")
 
         if cell.metadata.get("noteable", {}).get("cell_type") == "sql":
             source_type = "sql"
@@ -543,9 +529,7 @@ def chat_functions(self):
         ]
 
 
-def provide_notebook_creation(
-    registry: FunctionRegistry, project_id: Optional[str] = None
-):
+def provide_notebook_creation(registry: FunctionRegistry, project_id: Optional[str] = None):
     """Register the notebook client with the registry.
 
     >>> from chatlab import FunctionRegistry, Chat

chatlab/builtins/python.py

@@ -16,12 +16,8 @@ def apply_llm_formatter(shell: InteractiveShell):
     """Apply the LLM formatter to the given shell."""
     llm_formatter = register_llm_formatter(shell)
 
-    llm_formatter.for_type_by_name(
-        "pandas.core.frame", "DataFrame", format_dataframe_for_llm
-    )
-    llm_formatter.for_type_by_name(
-        "pandas.core.series", "Series", format_series_for_llm
-    )
+    llm_formatter.for_type_by_name("pandas.core.frame", "DataFrame", format_dataframe_for_llm)
+    llm_formatter.for_type_by_name("pandas.core.series", "Series", format_series_for_llm)
 
 
 def get_or_create_ipython() -> InteractiveShell:
@@ -80,9 +76,7 @@ def run_cell(self, code: str):
 
             # Create a formatted traceback that includes the last 3 frames
             # and the exception message
-            formatted = TracebackException.from_exception(exception, limit=3).format(
-                chain=True
-            )
+            formatted = TracebackException.from_exception(exception, limit=3).format(chain=True)
             plaintext_traceback = "\n".join(formatted)
 
             return plaintext_traceback

chatlab/builtins/shell.py

@@ -15,9 +15,7 @@ async def run_shell_command(command: str):
     Returns:
     - str: the output of the shell command
     """
-    process = await asyncio.create_subprocess_shell(
-        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-    )
+    process = await asyncio.create_subprocess_shell(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = await process.communicate()
 
     resp = f"Return Code: {process.returncode}\n"

chatlab/chat.py

@@ -20,11 +20,7 @@
 from deprecation import deprecated
 from IPython.core.async_helpers import get_asyncio_loop
 from openai import AsyncOpenAI
-from openai.types.chat import (
-    ChatCompletion,
-    ChatCompletionChunk,
-    ChatCompletionMessageParam,
-)
+from openai.types.chat import ChatCompletion, ChatCompletionChunk, ChatCompletionMessageParam
 from pydantic import BaseModel
 
 from chatlab.views.assistant_function_call import AssistantFunctionCallView
@@ -114,9 +110,7 @@ def __init__(
 
                 python_hallucination_function = run_cell
 
-            self.function_registry = FunctionRegistry(
-                python_hallucination_function=python_hallucination_function
-            )
+            self.function_registry = FunctionRegistry(python_hallucination_function=python_hallucination_function)
         else:
             self.function_registry = function_registry
 
@@ -139,9 +133,7 @@ def chat(
         """
         raise Exception("This method is deprecated. Use `submit` instead.")
 
-    async def __call__(
-        self, *messages: Union[ChatCompletionMessageParam, str], stream=True, **kwargs
-    ):
+    async def __call__(self, *messages: Union[ChatCompletionMessageParam, str], stream=True, **kwargs):
         """Send messages to the chat model and display the response."""
         return await self.submit(*messages, stream=stream, **kwargs)
 
@@ -175,9 +167,7 @@ async def __process_stream(
                         function_view = AssistantFunctionCallView(function_call.name)
                     if function_call.arguments is not None:
                         if function_view is None:
-                            raise ValueError(
-                                "Function arguments provided without function name"
-                            )
+                            raise ValueError("Function arguments provided without function name")
                         function_view.append(function_call.arguments)
             if choice.finish_reason is not None:
                 finish_reason = choice.finish_reason
@@ -194,9 +184,7 @@ async def __process_stream(
 
         return (finish_reason, function_view)
 
-    async def __process_full_completion(
-        self, resp: ChatCompletion
-    ) -> Tuple[str, Optional[AssistantFunctionCallView]]:
+    async def __process_full_completion(self, resp: ChatCompletion) -> Tuple[str, Optional[AssistantFunctionCallView]]:
         assistant_view: AssistantMessageView = AssistantMessageView()
         function_view: Optional[AssistantFunctionCallView] = None
 
@@ -218,9 +206,7 @@ async def __process_full_completion(
 
         return choice.finish_reason, function_view
 
-    async def submit(
-        self, *messages: Union[ChatCompletionMessageParam, str], stream=True, **kwargs
-    ):
+    async def submit(self, *messages: Union[ChatCompletionMessageParam, str], stream=True, **kwargs):
         """Send messages to the chat model and display the response.
 
         Side effects:
@@ -248,7 +234,8 @@ async def submit(
 
             manifest = self.function_registry.api_manifest()
 
-            # Due to the strict response typing based on `Literal` typing on `stream`, we have to process these two cases separately
+            # Due to the strict response typing based on `Literal` typing on `stream`, we have to process these
+            # two cases separately
             if stream:
                 streaming_response = await client.chat.completions.create(
                     model=self.model,
@@ -258,9 +245,7 @@ async def submit(
                     temperature=kwargs.get("temperature", 0),
                 )
 
-                finish_reason, function_call_request = await self.__process_stream(
-                    streaming_response
-                )
+                finish_reason, function_call_request = await self.__process_stream(streaming_response)
             else:
                 full_response = await client.chat.completions.create(
                     model=self.model,
@@ -413,9 +398,7 @@ def ipython_magic_submit(self, line, cell: Optional[str] = None, **kwargs):
             return
         cell = cell.strip()
 
-        asyncio.run_coroutine_threadsafe(
-            self.submit(cell, **kwargs), get_asyncio_loop()
-        )
+        asyncio.run_coroutine_threadsafe(self.submit(cell, **kwargs), get_asyncio_loop())
 
     def make_magic(self, name):
         """Register the chat as an IPython magic with the given name.
@@ -435,6 +418,4 @@ def make_magic(self, name):
         if ip is None:
             raise Exception("IPython is not available.")
 
-        ip.register_magic_function(
-            self.ipython_magic_submit, magic_kind="line_cell", magic_name=name
-        )
+        ip.register_magic_function(self.ipython_magic_submit, magic_kind="line_cell", magic_name=name)

chatlab/components/function_details.py

@@ -27,9 +27,7 @@
 
 def function_logo():
     """Styled 𝑓 logo component for use in the chat function component."""
-    return span(
-        "𝑓", style=dict(color=colors["light"], paddingRight="5px", paddingLeft="5px")
-    )
+    return span("𝑓", style=dict(color=colors["light"], paddingRight="5px", paddingLeft="5px"))
 
 
 def function_verbage(state: str):
@@ -42,9 +40,7 @@ def function_verbage(state: str):
 
 def inline_pre(text: str):
     """A simple preformatted monospace component that works in all Jupyter frontends."""
-    return span(
-        text, style=dict(unicodeBidi="embed", fontFamily="monospace", whiteSpace="pre")
-    )
+    return span(text, style=dict(unicodeBidi="embed", fontFamily="monospace", whiteSpace="pre"))
 
 
 def raw_function_interface_heading(text: str):
@@ -87,9 +83,7 @@ def ChatFunctionComponent(
     input_element = div()
     if input is not None:
         input = input.strip()
-        input_element = div(
-            raw_function_interface_heading("Input:"), raw_function_interface(input)
-        )
+        input_element = div(raw_function_interface_heading("Input:"), raw_function_interface(input))
 
     output_element = div()
     if output is not None:
@@ -100,9 +94,7 @@ def ChatFunctionComponent(
         )
 
     return div(
-        style(
-            ".chatlab-chat-details summary > *  { display: inline; color: #27374D; }"
-        ),
+        style(".chatlab-chat-details summary > *  { display: inline; color: #27374D; }"),
         details(
             summary(
                 function_logo(),

chatlab/display.py

@@ -56,15 +56,11 @@ async def call(self) -> ChatCompletionMessageParam:
             self.finished = True
             self.set_state("No function named")
             self.function_result = repr(e)
-            return system(
-                f"Function {function_name} not found in function registry: {e}"
-            )
+            return system(f"Function {function_name} not found in function registry: {e}")
         except Exception as e:
             # Check to see if the user has requested that the exception be exposed to LLM.
             # If not, then we just raise it and let the user handle it.
-            chatlab_metadata = self.function_registry.get_chatlab_metadata(
-                function_name
-            )
+            chatlab_metadata = self.function_registry.get_chatlab_metadata(function_name)
 
             if not chatlab_metadata.expose_exception_to_llm:
                 # Bubble up the exception to the user

chatlab/messaging.py

@@ -60,9 +60,7 @@ def system(content: str) -> ChatCompletionMessageParam:
     }
 
 
-def assistant_function_call(
-    name: str, arguments: Optional[str] = None
-) -> ChatCompletionMessageParam:
+def assistant_function_call(name: str, arguments: Optional[str] = None) -> ChatCompletionMessageParam:
     """Create a function call message from the assistant.
 
     Args: