kash-shell 0.3.36__py3-none-any.whl → 0.3.37__py3-none-any.whl

kash/local_server/local_server_routes.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from urllib.parse import urlencode
 
@@ -55,7 +55,7 @@ def format_local_url(route_path: str, **params: str | None) -> str:
     return url
 
 
-class Route(str, Enum):
+class Route(StrEnum):
     file_view = "/file/view"
     item_view = "/item/view"
     explain = "/explain"

kash/media_base/transcription_deepgram.py

@@ -5,34 +5,28 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from clideps.env_vars.dotenv_utils import load_dotenv_paths
-from httpx import Timeout
 
 from kash.config.logger import CustomLogger, get_logger
 from kash.config.settings import global_settings
 from kash.media_base.transcription_format import SpeakerSegment, format_speaker_segments
-from kash.utils.errors import ApiError, ContentError
+from kash.utils.errors import ContentError
 
 if TYPE_CHECKING:
-    from deepgram import PrerecordedResponse
+    from deepgram.types.listen_v1accepted_response import ListenV1AcceptedResponse
+    from deepgram.types.listen_v1response import ListenV1Response
 
 log: CustomLogger = get_logger(__name__)
 
 
 def deepgram_transcribe_raw(
     audio_file_path: Path, language: str | None = None
-) -> PrerecordedResponse:
+) -> ListenV1Response | ListenV1AcceptedResponse:
     """
     Transcribe an audio file using Deepgram and return the raw response.
     """
     # Slow import, do lazily.
-    from deepgram import (
-        ClientOptionsFromEnv,
-        DeepgramClient,
-        FileSource,
-        ListenRESTClient,
-        PrerecordedOptions,
-        PrerecordedResponse,
-    )
+    from deepgram import DeepgramClient
+    from deepgram.core.request_options import RequestOptions
 
     size = getsize(audio_file_path)
     log.info(
@@ -40,21 +34,19 @@ def deepgram_transcribe_raw(
     )
 
     load_dotenv_paths(True, True, global_settings().system_config_dir)
-    deepgram = DeepgramClient("", ClientOptionsFromEnv())
+    deepgram = DeepgramClient()
 
     with open(audio_file_path, "rb") as audio_file:
         buffer_data = audio_file.read()
 
-    payload: FileSource = {
-        "buffer": buffer_data,
-    }
-
-    options = PrerecordedOptions(model="nova-2", smart_format=True, diarize=True, language=language)
-    client: ListenRESTClient = deepgram.listen.rest.v("1")  # pyright: ignore
-
-    response = client.transcribe_file(payload, options, timeout=Timeout(500))
-    if not isinstance(response, PrerecordedResponse):
-        raise ApiError("Deepgram returned an unexpected response type")
+    response = deepgram.listen.v1.media.transcribe_file(
+        request=buffer_data,
+        model="nova-2",
+        smart_format=True,
+        diarize=True,
+        language=language,
+        request_options=RequestOptions(timeout_in_seconds=500),
+    )
 
     return response
 
@@ -64,7 +56,9 @@ def deepgram_transcribe_audio(audio_file_path: Path, language: str | None = None
 
     log.save_object("Deepgram response", None, response)
 
-    diarized_segments = _deepgram_diarized_segments(response)
+    # Convert Pydantic model to dict for processing.
+    response_dict = response.model_dump()
+    diarized_segments = _deepgram_diarized_segments(response_dict)
     log.debug("Diarized response: %s", diarized_segments)
 
     if not diarized_segments:

kash/model/assistant_response_model.py

@@ -1,11 +1,11 @@
-from enum import Enum
+from enum import StrEnum
 
 from pydantic import BaseModel
 
 from kash.exec_model.commands_model import CommentedCommand
 
 
-class Confidence(str, Enum):
+class Confidence(StrEnum):
     """
     How confident the assistant is that the answer is correct.
     """

kash/shell/file_icons/nerd_icons.py

@@ -17,7 +17,7 @@
 
 import os
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 
 NBSP = "\u00a0"
 
@@ -35,7 +35,7 @@ class Icon:
 
 
 # fmt: off
-class Icons(str, Enum):
+class Icons(StrEnum):
     ARCHIVE = '\uf410'             # 
     AUDIO = "\uf001"               # 
     BINARY = "\ueae8"              # 

kash/shell/output/kerm_codes.py

@@ -67,7 +67,7 @@ https://www.ethanheilman.com/x/28/index.html
 #   files, so that legacy shell commands automatically have tooltips with info
 #   about files).
 
-from enum import Enum
+from enum import StrEnum
 from html import escape
 from typing import Annotated, Literal, Self, TypeAlias
 from urllib.parse import parse_qs, quote, urlencode, urlparse
@@ -91,7 +91,7 @@ KUI_SCHEME = f"{KUI_PROTOCOL}//"
 """The Kerm code URI scheme for embedding UI elements into links."""
 
 
-class UIActionType(str, Enum):
+class UIActionType(StrEnum):
     paste_text = "paste_text"
     """Default action for pasting text into the terminal. If value is omitted, paste the link text."""
 
@@ -120,7 +120,7 @@ class UIAction(BaseModel):
         return self.model_dump_json()
 
 
-class DisplayStyle(str, Enum):
+class DisplayStyle(StrEnum):
     """
     Style for text.
     """
@@ -157,14 +157,14 @@ class DisplayHints(BaseModel):
     dimensions: Dimensions | None = Field(default=None, description="Dimensions.")
 
 
-class UIRole(str, Enum):
+class UIRole(StrEnum):
     tooltip = "tooltip"
     popover = "popover"
     output = "output"
     input = "input"
 
 
-class UIElementType(str, Enum):
+class UIElementType(StrEnum):
     text_tooltip = "text_tooltip"
     link_tooltip = "link_tooltip"
     iframe_tooltip = "iframe_tooltip"

kash/utils/api_utils/cache_requests_limited.py

@@ -32,13 +32,11 @@ class CachingSession(requests.Session):
     ):
         super().__init__()
         self._limiter: Limiter | None = None
+        self._max_wait_secs = max_wait_secs
         if limit and limit_interval_secs:
             rate = Rate(limit, Duration.SECOND * limit_interval_secs)
             bucket = InMemoryBucket([rate])
-            # Explicitly set raise_when_fail=False and max_delay to enable blocking.
-            self._limiter = Limiter(
-                bucket, raise_when_fail=False, max_delay=Duration.SECOND * max_wait_secs
-            )
+            self._limiter = Limiter(bucket)
             log.info(
                 "CachingSession: rate limiting requests with limit=%d, interval=%d, max_wait=%d",
                 limit,
@@ -56,9 +54,11 @@ class CachingSession(requests.Session):
 
         def save(path: Path):
             if self._limiter:
-                acquired = self._limiter.try_acquire("caching_session_get")
+                acquired = self._limiter.try_acquire(
+                    "caching_session_get", blocking=True, timeout=self._max_wait_secs
+                )
                 if not acquired:
-                    # Generally shouldn't happen.
+                    # Generally shouldn't happen with blocking=True and reasonable timeout.
                     raise RuntimeError("Rate limiter failed to acquire after maximum delay")
 
             response = super(CachingSession, self).get(url, **kwargs)

kash/utils/file_formats/chat_format.py

@@ -94,7 +94,7 @@ content: |
 from __future__ import annotations
 
 from dataclasses import field
-from enum import Enum
+from enum import Enum, StrEnum
 from io import StringIO
 from pathlib import Path
 from textwrap import dedent
@@ -106,7 +106,7 @@ from pydantic.dataclasses import dataclass
 from sidematter_format import to_json_string
 
 
-class ChatRole(str, Enum):
+class ChatRole(StrEnum):
     """
     The role of a message in a chat. Represents the "role" in LLM APIs but note we slightly
     abuse this term to also represent other types of messages, such as commands issued

kash/utils/file_utils/file_sort_filter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 log = get_logger(__name__)
 
 
-class SortOption(str, Enum):
+class SortOption(StrEnum):
     filename = "filename"
     size = "size"
     accessed = "accessed"
@@ -28,13 +28,13 @@ class SortOption(str, Enum):
     modified = "modified"
 
 
-class GroupByOption(str, Enum):
+class GroupByOption(StrEnum):
     flat = "flat"
     parent = "parent"
     suffix = "suffix"
 
 
-class FileType(str, Enum):
+class FileType(StrEnum):
     file = "file"
     dir = "dir"
 

{kash_shell-0.3.36.dist-info → kash_shell-0.3.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.36
+Version: 0.3.37
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>

{kash_shell-0.3.36.dist-info → kash_shell-0.3.37.dist-info}/RECORD

@@ -142,7 +142,7 @@ kash/llm_utils/llms.py,sha256=sGDrTnYAqjg_keKhXa7JR3HHkp5Klt-OhO3t9YjuhVQ,4036
 kash/local_server/__init__.py,sha256=AyNpvCOJlQF6A4DnlYKRMbbfRNzdizEA-ytp-F2SLZU,162
 kash/local_server/local_server.py,sha256=EugjL30VM0pWdZDsiQxU-o6EdEa082qlGd_7RHvI5tk,5863
 kash/local_server/local_server_commands.py,sha256=T5wN-Xty3IbwbyeJxTULPB2NqssWLJcuV8IoqMu9bus,1668
-kash/local_server/local_server_routes.py,sha256=JlIVsrbsU0yiwv7vAoD9BctqiBI0w6u8Ld3BYY4jmo8,10530
+kash/local_server/local_server_routes.py,sha256=Qx9I2GLoACLYhTlT8-SxbnFe-SKqfhWB6wDMDSEQD2s,10531
 kash/local_server/local_url_formatters.py,sha256=SqHjGMEufvm43n34SCa_8Asdwm7utx91Wwymj15TuSY,5327
 kash/local_server/port_tools.py,sha256=oFfOvO6keqS5GowTpVg2FTu5KqkPHBq-dWAEomUIgGo,2008
 kash/local_server/rich_html_template.py,sha256=O9CnkMYkWuMvKJkqD0P8jaZqfUe6hMP4LXFvcLpwN8Q,196
@@ -159,13 +159,13 @@ kash/media_base/media_cache.py,sha256=wNguo9nNnCRmr7GERrzDOj83xCYife7EnVvC2tlNtr
 kash/media_base/media_services.py,sha256=kmAjLIrG62twI8GCowSeR1yfpVWf1KfAhPbuxPiaQAA,5475
 kash/media_base/media_tools.py,sha256=enzSebW41vDBGWUwkEn5udhRHmSBvH01MAt5rY1s388,1466
 kash/media_base/timestamp_citations.py,sha256=IHTvlZD3lIfe8T2uHFitgom82WahdHBeKqyc2OjUi9g,2368
-kash/media_base/transcription_deepgram.py,sha256=yuwqgTPY-d7XnLMTuNDX0PLBxazqOy8osDXEscNOrGo,5308
+kash/media_base/transcription_deepgram.py,sha256=IXuGB8yRc4EMANCObxfedrAHktE1hVJGna-ZUkFCnf0,5191
 kash/media_base/transcription_format.py,sha256=rOVPTpwvW22c27BRwYF-Tc_xzqK_wOtUZpOPlvkHiDY,2344
 kash/media_base/transcription_whisper.py,sha256=GqvroW9kBAH4-gcbYkMgNCfs2MpMIgm1ip3NMWtJ0IE,1169
 kash/media_base/services/local_file_media.py,sha256=_NV-T90rShJ8ucUjQXMPCKKJ50GSFE9PyyVzhXp5z9w,5624
 kash/model/__init__.py,sha256=kFfBKb5N70NWYUfpRRxn_Sb9p_vXlB6BBaTCqWmSReo,2978
 kash/model/actions_model.py,sha256=I87Gb2nU6xelEuM8WFuuHWDqczjnlbpBYkw6wWIYkbo,23825
-kash/model/assistant_response_model.py,sha256=6eDfC27nyuBDFjv5nCYMa_Qb2mPbKwDzZy7uLOIyskI,2653
+kash/model/assistant_response_model.py,sha256=tS0PmVxhdRXpBM-qNUGB4opyXUf5R4Z_4750w6mYCbA,2654
 kash/model/compound_actions_model.py,sha256=oYEtVKtQv-mA1abZkK7PvaM9xazVBUuk1z0geKBulak,6965
 kash/model/concept_model.py,sha256=we2qOcy9Mv1q7XPfkDLp_CyO_-8DwAUfUYlpgy_jrFs,1011
 kash/model/exec_model.py,sha256=3Su3NEmEtDoSuQSxvg75FYY_EdClSM5pwQK1i7_S88A,3131
@@ -185,7 +185,7 @@ kash/shell/completions/completion_scoring.py,sha256=-svesm2cR1AA86jYcxlynXCBZON2
 kash/shell/completions/completion_types.py,sha256=FocRXd6Df3Df0nL2Y1GevMx3FsljJwbQdVgWsIngpaQ,4793
 kash/shell/completions/shell_completions.py,sha256=A0WWrm2lEwguasDMnDuaI8xGny9MhwGfNvCY3rHNUnw,8844
 kash/shell/file_icons/color_for_format.py,sha256=bFuE1lwiyUkgWB3Gk3jrch-9EIQz9thILQiX_a5dGb8,2034
-kash/shell/file_icons/nerd_icons.py,sha256=qF1Awc5cWIwaOWo7k_nmG9_A6XXwdNNcaluUUlde3KM,36046
+kash/shell/file_icons/nerd_icons.py,sha256=fxqICNUFXMy9miZxpr3dXAIEfQ-zUMweP3Ph3YjSR7Y,36047
 kash/shell/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kash/shell/input/input_prompts.py,sha256=LkF7Q7HygBOVT1XzvC0dY7gfCVV0pedfwI5nlX-I6YA,3820
 kash/shell/input/inquirer_settings.py,sha256=2zOtgE2DJNzl4vEiEb_Dt8SUeM1YWjeXhCRaAPOCScM,1645
@@ -193,7 +193,7 @@ kash/shell/input/param_inputs.py,sha256=FiGClMtMe0pv0y_45qJ9PKF61vn8SOPiNeh5yvH0
 kash/shell/input/shell_confirm.py,sha256=A17HTxx_DPnis2503Q_LOEW8P9yIWvaj1zHVz4LSz_Q,1070
 kash/shell/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kash/shell/output/kerm_code_utils.py,sha256=92A4AV-IFKKZMWLNZnd_zksNFMBgE_VNXySyn0Kn6Zk,1673
-kash/shell/output/kerm_codes.py,sha256=KLVdTM_dL_NeYmGbllzsQoW4IHXJjEsgqqIp1s7P1yI,18877
+kash/shell/output/kerm_codes.py,sha256=1ofHqH74XlUOH91_eLmn2PLx-yyd8usnbSKuJDczWqQ,18872
 kash/shell/output/kmarkdown.py,sha256=RRB5b0Ip0KZ71vnJKFfvxerYkeDFTCVTlHqHfmMy80Y,3675
 kash/shell/output/shell_formatting.py,sha256=oxmAeJ2j0ANYSUsL15CUv--KcGlQ6Wa_rywXSDlsZM4,3331
 kash/shell/output/shell_output.py,sha256=yG-4YjQUkPQZASMRGcfVRUadOcRO6hm-eaAC74jms6c,11812
@@ -206,7 +206,7 @@ kash/shell/utils/shell_function_wrapper.py,sha256=fgUuVhocYMKLkGJJQJOER5nFMAvM0Z
 kash/utils/__init__.py,sha256=4Jl_AtgRADdGORimWhYZwbSfQSpQ6SiexNIZzmbcngI,111
 kash/utils/errors.py,sha256=2lPL0fxI8pPOiDvjl0j-rvwY8uhmWetsrYYIc2-x1WY,3906
 kash/utils/api_utils/api_retries.py,sha256=TtgxLxoMnXIzYMKbMUzsnVcPf-aKFm3cJ95zOcSeae8,21844
-kash/utils/api_utils/cache_requests_limited.py,sha256=TA5buZ9Dgbj4I1zHhwerTXre018i0TCACGsezsjX9Uc,3140
+kash/utils/api_utils/cache_requests_limited.py,sha256=4beytcBbZYuCXbT1QK8LaD98GBLnT3mcvjhFkNN0YII,3127
 kash/utils/api_utils/gather_limited.py,sha256=6K0Z3u_NeX9wBfFFk21wUQeSimaDIm53AHlGYRLD6LQ,33018
 kash/utils/api_utils/http_utils.py,sha256=Ou6QNiba5w7n71cgNmV168OFTLmMDNxWW5MM-XkFEME,1461
 kash/utils/api_utils/multitask_gather.py,sha256=LAylwWZ2APbv-O_l0kLwBfP762D0qswMBV8ID4eCOA0,4446
@@ -228,14 +228,14 @@ kash/utils/common/type_utils.py,sha256=SJirXhPilQom_-OKkFToDLm_82ZwpjcNjRy8U1HaQ
 kash/utils/common/uniquifier.py,sha256=75OY4KIVF8u1eoO0FCPbEGTyVpPOtM-0ctoG_s_jahM,3082
 kash/utils/common/url.py,sha256=u4qT0sWYsuEYazFCr3IIpmrR6nXyATH-_6GHM2xF5E0,9689
 kash/utils/common/url_slice.py,sha256=QJb_qJp-hd5lFrxpw7P009yeMTJWDMfF11KRKEo7mIA,10963
-kash/utils/file_formats/chat_format.py,sha256=XQpyUyq3jBKqM1f1eRZmg5hPBWZIobHNusQPFctFbRQ,11901
+kash/utils/file_formats/chat_format.py,sha256=MY2Gz09p8c_-MxS8l2WkGAOP8os9Sw8c_ZcKrpqEzN4,11908
 kash/utils/file_utils/__init__.py,sha256=loL_iW0oOZs0mJ5GelBPptBcqzYKSWdsGcHrpRyxitQ,43
 kash/utils/file_utils/csv_utils.py,sha256=ZqchXD4y0buWtgnEsR_UeHyWBHM1wEJl5u-IxQvFa3s,4064
 kash/utils/file_utils/dir_info.py,sha256=HamMr58k_DanTLifj7A2JDxTGWXEZZx2pQuE6Hjcm8g,1856
 kash/utils/file_utils/file_ext.py,sha256=U0fG3rowgtc56fNhhCK8P1UCYFbCNoa87pv7mGiEQgA,1876
 kash/utils/file_utils/file_formats.py,sha256=4bq0-ZomFidL2GJBFyszGPurNQeTMOdLaXlGgrXznhA,4973
 kash/utils/file_utils/file_formats_model.py,sha256=WqtAb10_vBuWeP2cUHzUHNjNmLx5GdqPjsnuqziB6Zg,15970
-kash/utils/file_utils/file_sort_filter.py,sha256=_k1chT3dJl5lSmKA2PW90KaoG4k4zftGdtwWoNEljP4,7136
+kash/utils/file_utils/file_sort_filter.py,sha256=Y-0Yw9-CaG0LMIaVo9dSTI-eLlvIzmnU0MoeJwMJBs0,7133
 kash/utils/file_utils/file_walk.py,sha256=cpwVDPuaVm95_ZwFJiAdIuZAGhASI3gJ3ZUsCGP75b8,5527
 kash/utils/file_utils/filename_parsing.py,sha256=drHrH2B9W_5yAbXURNGJxNqj9GmTe8FayH6Gjw9e4-U,4194
 kash/utils/file_utils/ignore_files.py,sha256=QJ0SFeGdxSCaf4v45qQE_BMsMT5nOgomma0TuJRibp8,3546
@@ -305,8 +305,8 @@ kash/xonsh_custom/xonsh_modern_tools.py,sha256=mj_b34LZXfE8MJe9EpDmp5JZ0tDM1biYN
 kash/xonsh_custom/xonsh_ranking_completer.py,sha256=ZRGiAfoEgqgnlq2-ReUVEaX5oOgW1DQ9WxIv2OJLuTo,5620
 kash/xontrib/fnm.py,sha256=V2tsOdmIDgbFbZSfMLpsvDIwwJJqiYnOkOySD1cXNXw,3700
 kash/xontrib/kash_extension.py,sha256=FLIMlgR3C_6A1fwKE-Ul0nmmpJSszVPbAriinUyQ8Zg,1896
-kash_shell-0.3.36.dist-info/METADATA,sha256=LK3nnR0TWHtw_F8qG9WSihteRlQZXggGY8f-DwtUjBQ,33581
-kash_shell-0.3.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kash_shell-0.3.36.dist-info/entry_points.txt,sha256=SQraWDAo8SqYpthLXThei0mf_hGGyhYBUO-Er_0HcwI,85
-kash_shell-0.3.36.dist-info/licenses/LICENSE,sha256=rCh2PsfYeiU6FK_0wb58kHGm_Fj5c43fdcHEexiVzIo,34562
-kash_shell-0.3.36.dist-info/RECORD,,
+kash_shell-0.3.37.dist-info/METADATA,sha256=Nl6PtqxydXQXFJu9v7IKaioebse690jbQ68AB4myiXQ,33581
+kash_shell-0.3.37.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+kash_shell-0.3.37.dist-info/entry_points.txt,sha256=SQraWDAo8SqYpthLXThei0mf_hGGyhYBUO-Er_0HcwI,85
+kash_shell-0.3.37.dist-info/licenses/LICENSE,sha256=rCh2PsfYeiU6FK_0wb58kHGm_Fj5c43fdcHEexiVzIo,34562
+kash_shell-0.3.37.dist-info/RECORD,,

{kash_shell-0.3.36.dist-info → kash_shell-0.3.37.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any