kotharcomputing 0.86.0__tar.gz → 0.88.0__tar.gz

{kotharcomputing-0.86.0/src/kotharcomputing.egg-info → kotharcomputing-0.88.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kotharcomputing
-Version: 0.86.0
+Version: 0.88.0
 Summary: Python SDK for the Kothar API
 Author: Kothar Computing
 License-Expression: Apache-2.0

{kotharcomputing-0.86.0 → kotharcomputing-0.88.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "kotharcomputing"
-version = "0.86.0"
+version = "0.88.0"
 description = "Python SDK for the Kothar API"
 readme = "README.md"
 requires-python = ">=3.11"

{kotharcomputing-0.86.0 → kotharcomputing-0.88.0}/src/kotharcomputing/__init__.py

@@ -3,9 +3,14 @@ from .aleph_language_server import (
     AlephLanguageServerClientOptions,
     AnalyzeResult,
     AnalyzeResultWithAst,
+    AnalyzeResultWithAstAndFormat,
+    AnalyzeResultWithFormat,
+    AstFilter,
+    AstFilterClause,
     AstNode,
     AstNodeLocation,
     AstNodeType,
+    AstTextFilter,
     Diagnostic,
     DiagnosticSeverity,
     Position,
@@ -41,6 +46,7 @@ from .ai import (
     AIChatMessageAssistantDelta,
     AIChatMessageError,
     AIChatMessageTool,
+    AIChatMessageToolResult,
     AIChatMessageUser,
     AIChatMessageUserAppend,
     AIChatMessageUserContent,
@@ -51,7 +57,6 @@ from .ai import (
     AIChatToolCallFunction,
     AIChatToolDescription,
     AIChatToolDescriptionFunction,
-    AIModelInfo,
 )
 from .api_tokens import (
     ApiToken,
@@ -132,9 +137,14 @@ __all__ = [
     "AlephLanguageServerClientOptions",
     "AnalyzeResult",
     "AnalyzeResultWithAst",
+    "AnalyzeResultWithAstAndFormat",
+    "AnalyzeResultWithFormat",
+    "AstFilter",
+    "AstFilterClause",
     "AstNode",
     "AstNodeLocation",
     "AstNodeType",
+    "AstTextFilter",
     "Diagnostic",
     "DiagnosticSeverity",
     "Position",
@@ -168,6 +178,7 @@ __all__ = [
     "AIChatMessageAssistantDelta",
     "AIChatMessageError",
     "AIChatMessageTool",
+    "AIChatMessageToolResult",
     "AIChatMessageUser",
     "AIChatMessageUserAppend",
     "AIChatMessageUserContent",
@@ -178,7 +189,6 @@ __all__ = [
     "AIChatToolCallFunction",
     "AIChatToolDescription",
     "AIChatToolDescriptionFunction",
-    "AIModelInfo",
     # API Tokens
     "ApiToken",
     "ApiTokenPermissionAction",

{kotharcomputing-0.86.0 → kotharcomputing-0.88.0}/src/kotharcomputing/ai.py

@@ -112,13 +112,17 @@ class AIChatMessageError(TypedDict):
     error: ProblemDetails
 
 
-class AIChatMessageTool(TypedDict):
-    role: Literal["tool"]
+class AIChatMessageToolResult(TypedDict):
     toolCallId: str
     content: str
     status: NotRequired[Literal["success", "error"]]
 
 
+class AIChatMessageTool(TypedDict):
+    role: Literal["tool"]
+    results: list[AIChatMessageToolResult]
+
+
 AIChatMessage: TypeAlias = AIChatMessageApi | AIChatMessageUser | AIChatMessageAssistant
 AIChatMessageWithStreaming: TypeAlias = (
     AIChatMessage | AIChatMessageAssistantDelta | AIChatMessageError
@@ -139,12 +143,6 @@ class AIChatsPage(TypedDict):
     next: NotRequired[str]
 
 
-class AIModelInfo(TypedDict):
-    id: str
-    name: str
-    default: NotRequired[bool]
-
-
 class AIChatMessageUserCreate(TypedDict):
     role: Literal["user"]
     content: list[AIChatMessageUserContentEdition]
@@ -179,7 +177,6 @@ class AIChatByIdClient:
         *,
         message: AIChatMessageUserAppend,
         on: Callable[[AIChatMessage | AIChatMessageWithStreaming], None],
-        model: str | None = None,
         tools: list[AIChatToolDescription] | None = None,
         stream: bool | None = None,
     ) -> None:
@@ -189,7 +186,6 @@ class AIChatByIdClient:
             path_params={"workspaceId": self._workspace_id, "chatId": self._chat_id},
             json_data={
                 "message": message,
-                "model": model,
                 "tools": tools,
                 "stream": stream,
             },
@@ -224,7 +220,6 @@ class AIChatsClient:
         *,
         message: AIChatMessageUserCreate,
         on: Callable[[AIChatMessage | AIChatMessageWithStreaming], None],
-        model: str | None = None,
         tools: list[AIChatToolDescription] | None = None,
         stream: bool | None = None,
     ) -> None:
@@ -234,7 +229,6 @@ class AIChatsClient:
             path_params={"workspaceId": self._workspace_id},
             json_data={
                 "message": message,
-                "model": model,
                 "tools": tools,
                 "stream": stream,
             },
@@ -245,22 +239,6 @@ class AIChatsClient:
         return AIChatByIdClient(self._transport, self._workspace_id, chat_id)
 
 
-class AIModelsClient:
-    def __init__(self, transport: ApiTransport, workspace_id: str) -> None:
-        self._transport = transport
-        self._workspace_id = workspace_id
-
-    def list(self) -> list[AIModelInfo]:
-        return cast(
-            list[AIModelInfo],
-            self._transport.get_json(
-                "v1/workspaces/:workspaceId/ai/models",
-                path_params={"workspaceId": self._workspace_id},
-            ),
-        )
-
-
 class WorkspaceAIClient:
     def __init__(self, transport: ApiTransport, workspace_id: str) -> None:
         self.chats = AIChatsClient(transport, workspace_id)
-        self.models = AIModelsClient(transport, workspace_id)

kotharcomputing-0.88.0/src/kotharcomputing/aleph_language_server.py

@@ -0,0 +1,297 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from enum import IntEnum
+import json
+from typing import Literal, NotRequired, Required, TypedDict, cast, overload
+
+from .fetch import ApiTransport
+
+DEFAULT_BASE_URL = "https://aleph.kotharcomputing.com"
+
+
+@dataclass(slots=True)
+class AlephLanguageServerClientOptions:
+    base_url: str = DEFAULT_BASE_URL
+    timeout: float = 30.0
+
+
+class AlephLanguageServerClient:
+    def __init__(
+        self,
+        options: AlephLanguageServerClientOptions | None = None,
+        *,
+        base_url: str = DEFAULT_BASE_URL,
+        timeout: float = 30.0,
+    ) -> None:
+        if options is None:
+            options = AlephLanguageServerClientOptions(
+                base_url=base_url,
+                timeout=timeout,
+            )
+
+        self._transport = ApiTransport(
+            base_url=options.base_url,
+            access_token=None,
+            timeout=options.timeout,
+        )
+
+    def version(self) -> dict[str, str]:
+        return self._transport.get_json("version")
+
+    def format(
+        self,
+        code: str,
+        *,
+        tab_size: int | None = None,
+        insert_spaces: bool | None = None,
+        trim_trailing_whitespace: bool | None = None,
+        insert_final_newline: bool | None = None,
+        trim_final_newlines: bool | None = None,
+    ) -> str:
+        response = self._transport.raw(
+            "post",
+            "format",
+            headers={"Content-Type": "application/x-aleph"},
+            search_params={
+                "tab_size": tab_size,
+                "insert_spaces": insert_spaces,
+                "trim_trailing_whitespace": trim_trailing_whitespace,
+                "insert_final_newline": insert_final_newline,
+                "trim_final_newlines": trim_final_newlines,
+            },
+            body=code,
+        )
+        return response.text()
+
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: Literal[True],
+        filter_ast: AstFilter | None = ...,
+        format: Literal[True],
+    ) -> AnalyzeResultWithAstAndFormat: ...
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: Literal[True],
+        filter_ast: AstFilter | None = ...,
+        format: bool = ...,
+    ) -> AnalyzeResultWithAst: ...
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: bool = ...,
+        filter_ast: AstFilter,
+        format: Literal[True],
+    ) -> AnalyzeResultWithAstAndFormat: ...
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: bool = ...,
+        filter_ast: AstFilter,
+        format: bool = ...,
+    ) -> AnalyzeResultWithAst: ...
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: bool = ...,
+        filter_ast: None = ...,
+        format: Literal[True],
+    ) -> AnalyzeResultWithFormat: ...
+    @overload
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: bool = ...,
+        filter_ast: AstFilter | None = ...,
+        format: bool = ...,
+    ) -> AnalyzeResult: ...
+
+    def analyze(
+        self,
+        code: str,
+        *,
+        include_ast: bool = False,
+        filter_ast: AstFilter | None = None,
+        format: bool = False,
+    ) -> (
+        AnalyzeResult
+        | AnalyzeResultWithAst
+        | AnalyzeResultWithFormat
+        | AnalyzeResultWithAstAndFormat
+    ):
+        response = self._transport.raw(
+            "post",
+            "analyze",
+            headers={"Content-Type": "application/x-aleph"},
+            search_params={
+                "include_ast": include_ast or None,
+                "filter_ast": json.dumps(filter_ast, separators=(",", ":"))
+                if filter_ast is not None
+                else None,
+                "format": format or None,
+            },
+            body=code,
+        )
+        return cast(AnalyzeResult, response.json())
+
+
+# -- Aleph Diagnostic types (based on LSP 3.17 specification) --
+
+
+class DiagnosticSeverity(IntEnum):
+    Error = 1
+    Warning = 2
+    Information = 3
+    Hint = 4
+
+
+class Position(TypedDict):
+    line: int
+    character: int
+
+
+class Range(TypedDict):
+    start: Position
+    end: Position
+
+
+class Diagnostic(TypedDict):
+    range: Range
+    message: str
+    severity: NotRequired[DiagnosticSeverity]
+    code: NotRequired[str | int]
+    source: NotRequired[str]
+
+
+class AnalyzeResult(TypedDict):
+    diagnostics: list[Diagnostic]
+    ast: NotRequired[list[AstNode]]
+    format: NotRequired[list[str]]
+    error: NotRequired[str]
+
+
+class AnalyzeResultWithAst(AnalyzeResult):
+    ast: list[AstNode]
+
+
+class AnalyzeResultWithFormat(AnalyzeResult):
+    format: list[str]
+
+
+class AnalyzeResultWithAstAndFormat(AnalyzeResultWithAst, AnalyzeResultWithFormat):
+    pass
+
+
+class AstFilter(TypedDict):
+    any: list[AstFilterClause]
+
+
+class _AstFilterClauseBase(TypedDict, total=False):
+    descendants: int
+
+
+class _AstFilterClauseWithTypes(_AstFilterClauseBase, total=False):
+    types: Required[list[AstNodeType]]
+    text: AstTextFilter
+    children: AstFilter
+
+
+class _AstFilterClauseWithText(_AstFilterClauseBase, total=False):
+    types: list[AstNodeType]
+    text: Required[AstTextFilter]
+    children: AstFilter
+
+
+class _AstFilterClauseWithChildren(_AstFilterClauseBase, total=False):
+    types: list[AstNodeType]
+    text: AstTextFilter
+    children: Required[AstFilter]
+
+
+AstFilterClause = (
+    _AstFilterClauseWithTypes | _AstFilterClauseWithText | _AstFilterClauseWithChildren
+)
+
+
+class AstTextFilter(TypedDict):
+    pattern: str
+    mode: NotRequired[Literal["regex"]]
+
+
+class AstNode(TypedDict):
+    type: AstNodeType
+    text: NotRequired[str]
+    isSynthetic: NotRequired[Literal[True]]
+    location: AstNodeLocation
+    children: NotRequired[list[AstNode]]
+
+
+class AstNodeLocation(TypedDict):
+    uri: NotRequired[str]
+    range: Range
+
+
+AstNodeType = Literal[
+    "Id",
+    "Fun_Call",
+    "Unused_Return_Fun_Call",
+    "Arg_List",
+    "Slice_List",
+    "Slice",
+    "Equation",
+    "Var_Decl",
+    "Assign_Decl",
+    "Array_Call",
+    "Dot_Access",
+    "Lambda",
+    "Block",
+    "Scopeless_Block",
+    "Include",
+    "Def",
+    "While",
+    "If",
+    "For",
+    "Ranged_For",
+    "Inline_Array",
+    "Inline_Map",
+    "Return",
+    "File",
+    "Prefix",
+    "Break",
+    "Continue",
+    "Map_Pair",
+    "Value_Range",
+    "Inline_Range",
+    "Try",
+    "Catch",
+    "Finally",
+    "Method",
+    "Attr_Decl",
+    "Logical_And",
+    "Logical_Or",
+    "Reference",
+    "Switch",
+    "Case",
+    "Default",
+    "Noop",
+    "Class",
+    "Binary",
+    "Arg",
+    "Global_Decl",
+    "Constant",
+    "Compiled",
+    "Error",
+]

{kotharcomputing-0.86.0 → kotharcomputing-0.88.0/src/kotharcomputing.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kotharcomputing
-Version: 0.86.0
+Version: 0.88.0
 Summary: Python SDK for the Kothar API
 Author: Kothar Computing
 License-Expression: Apache-2.0

{kotharcomputing-0.86.0 → kotharcomputing-0.88.0}/tests/test_public_api.py

@@ -19,9 +19,14 @@ def test_package_import_and_public_exports() -> None:
         "AlephLanguageServerClientOptions",
         "AnalyzeResult",
         "AnalyzeResultWithAst",
+        "AnalyzeResultWithAstAndFormat",
+        "AnalyzeResultWithFormat",
+        "AstFilter",
+        "AstFilterClause",
         "AstNode",
         "AstNodeLocation",
         "AstNodeType",
+        "AstTextFilter",
         "Diagnostic",
         "DiagnosticSeverity",
         "Position",
@@ -55,6 +60,7 @@ def test_package_import_and_public_exports() -> None:
         "AIChatMessageAssistantDelta",
         "AIChatMessageError",
         "AIChatMessageTool",
+        "AIChatMessageToolResult",
         "AIChatMessageUser",
         "AIChatMessageUserAppend",
         "AIChatMessageUserContent",
@@ -65,7 +71,6 @@ def test_package_import_and_public_exports() -> None:
         "AIChatToolCallFunction",
         "AIChatToolDescription",
         "AIChatToolDescriptionFunction",
-        "AIModelInfo",
         # API Tokens
         "ApiToken",
         "ApiTokenPermissionAction",

kotharcomputing-0.86.0/src/kotharcomputing/aleph_language_server.py

@@ -1,162 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-from enum import IntEnum
-from typing import Literal, NotRequired, TypedDict, cast, overload
-
-from .fetch import ApiTransport
-
-DEFAULT_BASE_URL = "https://aleph.kotharcomputing.com"
-
-
-@dataclass(slots=True)
-class AlephLanguageServerClientOptions:
-    base_url: str = DEFAULT_BASE_URL
-    timeout: float = 30.0
-
-
-class AlephLanguageServerClient:
-    def __init__(
-        self,
-        options: AlephLanguageServerClientOptions | None = None,
-        *,
-        base_url: str = DEFAULT_BASE_URL,
-        timeout: float = 30.0,
-    ) -> None:
-        if options is None:
-            options = AlephLanguageServerClientOptions(
-                base_url=base_url,
-                timeout=timeout,
-            )
-
-        self._transport = ApiTransport(
-            base_url=options.base_url,
-            access_token=None,
-            timeout=options.timeout,
-        )
-
-    def version(self) -> dict[str, str]:
-        return self._transport.get_json("version")
-
-    @overload
-    def analyze(
-        self, code: str, *, include_ast: Literal[True]
-    ) -> AnalyzeResultWithAst: ...
-    @overload
-    def analyze(self, code: str, *, include_ast: bool = ...) -> AnalyzeResult: ...
-
-    def analyze(
-        self, code: str, *, include_ast: bool = False
-    ) -> AnalyzeResult | AnalyzeResultWithAst:
-        response = self._transport.raw(
-            "post",
-            "analyze",
-            headers={"Content-Type": "application/x-aleph"},
-            search_params={"include_ast": "true"} if include_ast else None,
-            body=code,
-        )
-        return cast(
-            AnalyzeResultWithAst if include_ast else AnalyzeResult, response.json()
-        )
-
-
-# -- Aleph Diagnostic types (based on LSP 3.17 specification) --
-
-
-class DiagnosticSeverity(IntEnum):
-    Error = 1
-    Warning = 2
-    Information = 3
-    Hint = 4
-
-
-class Position(TypedDict):
-    line: int
-    character: int
-
-
-class Range(TypedDict):
-    start: Position
-    end: Position
-
-
-class Diagnostic(TypedDict):
-    range: Range
-    message: str
-    severity: NotRequired[DiagnosticSeverity]
-    code: NotRequired[str | int]
-    source: NotRequired[str]
-
-
-class AnalyzeResult(TypedDict):
-    diagnostics: list[Diagnostic]
-
-
-class AnalyzeResultWithAst(AnalyzeResult):
-    ast: list[AstNode]
-
-
-class AstNode(TypedDict):
-    type: AstNodeType
-    text: NotRequired[str]
-    isSynthetic: NotRequired[Literal[True]]
-    location: NotRequired[AstNodeLocation]
-    children: NotRequired[list[AstNode]]
-
-
-class AstNodeLocation(TypedDict):
-    uri: NotRequired[str]
-    range: Range
-
-
-AstNodeType = Literal[
-    "Id",
-    "Fun_Call",
-    "Unused_Return_Fun_Call",
-    "Arg_List",
-    "Slice_List",
-    "Slice",
-    "Equation",
-    "Var_Decl",
-    "Assign_Decl",
-    "Array_Call",
-    "Dot_Access",
-    "Lambda",
-    "Block",
-    "Scopeless_Block",
-    "Include",
-    "Def",
-    "While",
-    "If",
-    "For",
-    "Ranged_For",
-    "Inline_Array",
-    "Inline_Map",
-    "Return",
-    "File",
-    "Prefix",
-    "Break",
-    "Continue",
-    "Map_Pair",
-    "Value_Range",
-    "Inline_Range",
-    "Try",
-    "Catch",
-    "Finally",
-    "Method",
-    "Attr_Decl",
-    "Logical_And",
-    "Logical_Or",
-    "Reference",
-    "Switch",
-    "Case",
-    "Default",
-    "Noop",
-    "Class",
-    "Binary",
-    "Arg",
-    "Global_Decl",
-    "Constant",
-    "Compiled",
-    "Error",
-]