remove old code referencing SK

Author: aacebo

python/packages/ai/poetry.lock

@@ -16,6 +16,7 @@ tiktoken = "^0.4.0"
 aiohttp = "^3.8.5"
 jsonschema = "^4.21.1"
 types-pyyaml = "^6.0.12.12"
+pyyaml = "^6.0.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"

python/packages/ai/pyproject.toml

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from typing import Any, Generic, Literal, Optional, TypeVar
 
-from ..promptsv2 import Message
+from ..prompts import Message
 
 ContentT = TypeVar("ContentT")
 PromptResponseStatus = Literal["success", "error", "rate_limited", "invalid_response", "too_long"]

python/packages/ai/teams/ai/models/prompt_response.py

@@ -3,8 +3,25 @@
 Licensed under the MIT License.
 """
 
-from .completion_config import CompletionConfig
+from .assistant_message import AssistantMessage
+from .conversation_history import ConversationHistory
+from .data_source_section import DataSourceSection
+from .function_call import FunctionCall
+from .function_call_message import FunctionCallMessage
+from .function_response_message import FunctionResponseMessage
+from .group_section import GroupSection
+from .layout_engine import LayoutEngine
+from .message import ImageContentPart, ImageUrl, Message, TextContentPart
+from .prompt import Prompt
+from .prompt_functions import PromptFunction, PromptFunctions
 from .prompt_manager import PromptManager
-from .prompt_section import RenderedPromptSection
+from .prompt_manager_options import PromptManagerOptions
+from .prompt_section import PromptSection
+from .prompt_section_base import PromptSectionBase
 from .prompt_template import PromptTemplate
-from .prompt_template_config import PromptTemplateConfig
+from .rendered_prompt_section import RenderedPromptSection
+from .system_message import SystemMessage
+from .template_section import TemplateSection
+from .text_section import TextSection
+from .user_input_message import UserInputMessage
+from .user_message import UserMessage

python/packages/ai/teams/ai/prompts/__init__.py

@@ -4,40 +4,85 @@
 """
 
 from dataclasses import dataclass
-from typing import List
+from typing import List, Literal, Optional
 
 
+# pylint: disable=too-many-instance-attributes
 @dataclass
 class CompletionConfig:
-    "interface for the completion configuration portion of a prompt template"
+    """
+    Interface for the completion configuration portion of a prompt template.
 
-    temperature: float
-    "the models temperature as a number between 0 and 1"
+    Attributes:
+        completion_type (Optional[Literal['chat','text']]): Type of completion to use.
+          Defaults to using the completion type of the configured default model.
+          New in schema version 1.1.
 
-    top_p: float
-    "the models top_p as a number between 0 and 1"
+        frequency_penalty (float): The models frequency_penalty as a number between 0 and 1.
+          Defaults to 0.
 
-    presence_penalty: float
-    "the models presence_penalty as a number between 0 and 1"
+        include_history (bool): If true, the prompt will be augmented with the conversation history.
+          Defaults to True.
+          New in schema version 1.1.
 
-    frequency_penalty: float
-    "the models frequency_penalty as a number between 0 and 1"
+        include_input (bool): If true, the prompt will be augmented with the user's input.
+          Defaults to True.
+          New in schema version 1.1.
 
-    max_tokens: int
-    "the models maximum number of tokens to generate"
+        include_images (bool): If true, the prompt will be augmented with any images
+          uploaded by the user. Defaults to False.
+          New in schema version 1.1.
 
-    stop_sequences: List[str]
-    "optional: array of stop sequences that when hit will stop generation"
+        max_tokens (int): The maximum number of tokens to generate.
+          Defaults to 150.
 
-    @staticmethod
-    def from_dict(data: dict) -> "CompletionConfig":
-        "creates a CompletionConfig from a dictionary"
-        # TODO: should we have default values for the properties?
-        return CompletionConfig(
-            temperature=data["temperature"],
-            top_p=data["top_p"],
-            presence_penalty=data["presence_penalty"],
-            frequency_penalty=data["frequency_penalty"],
-            max_tokens=data["max_tokens"],
-            stop_sequences=data.get("stop_sequences", []),
+        max_input_tokens (int): The maximum number of tokens allowed in the input.
+          Defaults to 2048.
+          New in schema version 1.1.
+
+        model (Optional[str]): Name of the model to use otherwise the configured
+          default model is used. Defaults to None.
+          New in schema version 1.1.
+
+        presence_penalty (float): The model's presence_penalty as a number between 0 and 1.
+          Defaults to 0.
+
+        stop_sequences (Optional[List[str]]): Array of stop sequences that when hit will
+          stop generation. Defaults to None.
+
+        temperature (float): The model's temperature as a number between 0 and 2.
+          Defaults to 0.
+
+        top_p (float): The model's top_p as a number between 0 and 2.
+          Defaults to 0.
+    """
+
+    completion_type: Optional[Literal["chat", "text"]] = None
+    frequency_penalty: float = 0
+    include_history: bool = True
+    include_input: bool = True
+    include_images: bool = False
+    max_tokens: int = 150
+    max_input_tokens: int = 2048
+    model: Optional[str] = None
+    presence_penalty: float = 0
+    stop_sequences: Optional[List[str]] = None
+    temperature: float = 0
+    top_p: float = 0
+
+    @classmethod
+    def from_dict(cls, data: dict) -> "CompletionConfig":
+        return cls(
+            completion_type=data.get("completion_type"),
+            frequency_penalty=data.get("frequency_penalty", 0),
+            include_history=data.get("include_history", True),
+            include_input=data.get("include_input", True),
+            include_images=data.get("include_images", False),
+            max_tokens=data.get("max_tokens", 150),
+            max_input_tokens=data.get("max_input_tokens", 2048),
+            model=data.get("model"),
+            presence_penalty=data.get("presence_penalty", 0),
+            stop_sequences=data.get("stop_sequences"),
+            temperature=data.get("temperature", 0),
+            top_p=data.get("top_p", 0),
         )