reorganize prompts to get rid of some errors

Author: aacebo

python/packages/ai/examples/openai_planner.py

@@ -7,5 +7,5 @@
 
 
 def fmt():
-    subprocess.run(["poetry", "run", "black", "teams", "scripts", "tests", "examples"], check=True)
-    subprocess.run(["poetry", "run", "isort", "teams", "scripts", "tests", "examples"], check=True)
+    subprocess.run(["poetry", "run", "black", "teams", "scripts", "tests"], check=True)
+    subprocess.run(["poetry", "run", "isort", "teams", "scripts", "tests"], check=True)

python/packages/ai/scripts/fmt.py

@@ -10,4 +10,3 @@ def lint():
     subprocess.run(["poetry", "run", "pylint", "teams", "scripts", "tests"], check=True)
     subprocess.run(["poetry", "run", "mypy", "--check-untyped-defs", "-p", "teams"], check=True)
     subprocess.run(["poetry", "run", "mypy", "--check-untyped-defs", "-p", "tests"], check=True)
-    subprocess.run(["poetry", "run", "mypy", "--check-untyped-defs", "-p", "examples"], check=True)

python/packages/ai/scripts/lint.py

@@ -7,7 +7,7 @@
 
 from botbuilder.core import TurnContext
 
-from teams.ai.prompts.prompt_section import RenderedPromptSection
+from teams.ai.prompts.rendered_prompt_section import RenderedPromptSection
 from teams.ai.tokenizers import Tokenizer
 from teams.state.memory import Memory
 

python/packages/ai/teams/ai/data_sources/data_source.py

@@ -8,7 +8,7 @@
 from botbuilder.core import TurnContext
 
 from teams.ai.data_sources.data_source import DataSource
-from teams.ai.prompts.prompt_section import RenderedPromptSection
+from teams.ai.prompts.rendered_prompt_section import RenderedPromptSection
 from teams.ai.tokenizers import Tokenizer
 from teams.state.memory import Memory
 

python/packages/ai/teams/ai/data_sources/text_data_source.py

@@ -4,24 +4,17 @@
 """
 
 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_manager_options import PromptManagerOptions
-from .prompt_section import PromptSection
-from .prompt_section_base import PromptSectionBase
 from .prompt_template import PromptTemplate
 from .rendered_prompt_section import RenderedPromptSection
+from .sections import *
 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

@@ -3,7 +3,7 @@
 Licensed under the MIT License.
 """
 
-from .template_section import TemplateSection
+from .sections.template_section import TemplateSection
 
 
 class AssistantMessage(TemplateSection):

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

@@ -14,8 +14,8 @@
 from .function_call import FunctionCall
 from .message import Message
 from .prompt_functions import PromptFunctions
-from .prompt_section_base import PromptSectionBase
 from .rendered_prompt_section import RenderedPromptSection
+from .sections.prompt_section_base import PromptSectionBase
 
 
 class FunctionCallMessage(PromptSectionBase):

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

@@ -12,8 +12,8 @@
 from ..utilities import to_string
 from .message import Message
 from .prompt_functions import PromptFunctions
-from .prompt_section_base import PromptSectionBase
 from .rendered_prompt_section import RenderedPromptSection
+from .sections.prompt_section_base import PromptSectionBase
 
 
 class FunctionResponseMessage(PromptSectionBase):

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

@@ -5,11 +5,11 @@
 
 from typing import List
 
-from .layout_engine import LayoutEngine
-from .prompt_section import PromptSection
+from .sections.layout_engine_section import LayoutEngineSection
+from .sections.prompt_section import PromptSection
 
 
-class Prompt(LayoutEngine):
+class Prompt(LayoutEngineSection):
     """
     Top level prompt section.
 

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

@@ -15,15 +15,17 @@
 from ...state import Memory
 from ..data_sources import DataSource
 from ..tokenizers import Tokenizer
-from .conversation_history import ConversationHistory
-from .group_section import GroupSection
 from .prompt import Prompt
 from .prompt_functions import PromptFunction, PromptFunctions
 from .prompt_manager_options import PromptManagerOptions
-from .prompt_section import PromptSection
 from .prompt_template import PromptTemplate
 from .prompt_template_config import PromptTemplateConfig
-from .template_section import TemplateSection
+from .sections import (
+    ConversationHistorySection,
+    GroupSection,
+    PromptSection,
+    TemplateSection,
+)
 from .user_input_message import UserInputMessage
 from .user_message import UserMessage
 
@@ -254,7 +256,7 @@ async def get_prompt(self, name) -> PromptTemplate:
             #   max_input_tokens.
             if template_config.completion.include_history:
                 sections.append(
-                    ConversationHistory(
+                    ConversationHistorySection(
                         f"conversation.{template_name}_history",
                         self._options.max_conversation_history_tokens,
                     )

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

@@ -6,8 +6,8 @@
 from dataclasses import dataclass
 from typing import Generic, Optional, TypeVar
 
-from .prompt_section import PromptSection
 from .rendered_prompt_section import RenderedPromptSection
+from .sections.prompt_section import PromptSection
 
 T = TypeVar("T")
 

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

@@ -5,8 +5,8 @@
 
 from dataclasses import dataclass
 
-from .prompt_section import PromptSection
 from .prompt_template_config import PromptTemplateConfig
+from .sections.prompt_section import PromptSection
 
 
 @dataclass

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

@@ -0,0 +1,12 @@
+"""
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the MIT License.
+"""
+from .conversation_history_section import ConversationHistorySection
+from .data_source_section import DataSourceSection
+from .group_section import GroupSection
+from .layout_engine_section import LayoutEngineSection
+from .prompt_section import PromptSection
+from .prompt_section_base import PromptSectionBase
+from .template_section import TemplateSection
+from .text_section import TextSection

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

@@ -7,16 +7,16 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..tokenizers import Tokenizer
-from ..utilities import to_string
-from .message import Message
-from .prompt_functions import PromptFunctions
+from ....state import Memory
+from ...tokenizers import Tokenizer
+from ...utilities import to_string
+from ..message import Message
+from ..prompt_functions import PromptFunctions
+from ..rendered_prompt_section import RenderedPromptSection
 from .prompt_section_base import PromptSectionBase
-from .rendered_prompt_section import RenderedPromptSection
 
 
-class ConversationHistory(PromptSectionBase):
+class ConversationHistorySection(PromptSectionBase):
     """
     A section that renders the conversation history.
     """
@@ -109,7 +109,7 @@ async def render_as_text(
         for msg in reversed(history):
             msg = Message(role=msg.role, content=to_string(tokenizer, msg.content))
             prefix = self.user_prefix if msg.role == "user" else self.assistant_prefix
-            line = prefix + msg.content
+            line = prefix + (msg.content if msg.content is not None else "")
             length = len(tokenizer.encode(line)) + (separator_length if len(lines) > 0 else 0)
 
             # Add initial line if required
@@ -169,7 +169,13 @@ async def render_as_messages(
 
             # Add length of any image parts
             if isinstance(message.content, list):
-                length += sum(1 for part in message.content if part.type == "image") * 85
+                count = 0
+
+                for part in message.content:
+                    if not isinstance(part, str) and part.type == "image":
+                        count += 1
+
+                length += count * 85
 
             # Add initial message if required
             if len(messages) == 0 and self.required:

python/packages/ai/teams/ai/prompts/conversation_history.py renamed to python/packages/ai/teams/ai/prompts/sections/conversation_history_section.py

@@ -7,13 +7,13 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..data_sources import DataSource
-from ..tokenizers import Tokenizer
-from .message import Message
-from .prompt_functions import PromptFunctions
+from ....state import Memory
+from ...data_sources import DataSource
+from ...tokenizers import Tokenizer
+from ..message import Message
+from ..prompt_functions import PromptFunctions
+from ..rendered_prompt_section import RenderedPromptSection
 from .prompt_section_base import PromptSectionBase
-from .rendered_prompt_section import RenderedPromptSection
 
 
 class DataSourceSection(PromptSectionBase):

python/packages/ai/teams/ai/prompts/data_source_section.py renamed to python/packages/ai/teams/ai/prompts/sections/data_source_section.py

@@ -7,22 +7,22 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..tokenizers import Tokenizer
-from .layout_engine import LayoutEngine
-from .message import Message
-from .prompt_functions import PromptFunctions
+from ....state import Memory
+from ...tokenizers import Tokenizer
+from ..message import Message
+from ..prompt_functions import PromptFunctions
+from ..rendered_prompt_section import RenderedPromptSection
+from .layout_engine_section import LayoutEngineSection
 from .prompt_section import PromptSection
 from .prompt_section_base import PromptSectionBase
-from .rendered_prompt_section import RenderedPromptSection
 
 
 class GroupSection(PromptSectionBase):
     """
     A group of sections that will rendered as a single message.
     """
 
-    _layout_engine: LayoutEngine
+    _layout_engine: LayoutEngineSection
     _sections: List[PromptSection]
     _role: str
 
@@ -48,7 +48,7 @@ def __init__(
             text_prefix (str, optional): Prefix to use for text output. Defaults to ``.
         """
         super().__init__(tokens, required, separator, text_prefix)
-        self._layout_engine = LayoutEngine(sections, tokens, required, separator)
+        self._layout_engine = LayoutEngineSection(sections, tokens, required, separator)
         self._sections = sections
         self._role = role
 

python/packages/ai/teams/ai/prompts/group_section.py renamed to python/packages/ai/teams/ai/prompts/sections/group_section.py

@@ -8,16 +8,16 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..tokenizers import Tokenizer
-from .message import Message
-from .prompt_functions import PromptFunctions
+from ....state import Memory
+from ...tokenizers import Tokenizer
+from ..message import Message
+from ..prompt_functions import PromptFunctions
+from ..prompt_section_layout import _PromptSectionLayout
+from ..rendered_prompt_section import RenderedPromptSection
 from .prompt_section import PromptSection
-from .prompt_section_layout import _PromptSectionLayout
-from .rendered_prompt_section import RenderedPromptSection
 
 
-class LayoutEngine(PromptSection):
+class LayoutEngineSection(PromptSection):
     """
     Base layout engine that renders a set of `auto`, `fixed`, or `proportional` length sections.
     This class is used internally by the `Prompt` and `GroupSection` classes to
@@ -159,7 +159,7 @@ def _add_sections_to_layout(
         self, sections: List[PromptSection], layout: List[_PromptSectionLayout[Any]]
     ):
         for section in sections:
-            if isinstance(section, LayoutEngine):
+            if isinstance(section, LayoutEngineSection):
                 self._add_sections_to_layout(section.sections, layout)
             else:
                 layout.append(_PromptSectionLayout(section=section))

python/packages/ai/teams/ai/prompts/layout_engine.py renamed to python/packages/ai/teams/ai/prompts/sections/layout_engine_section.py

@@ -8,11 +8,11 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..tokenizers import Tokenizer
-from .message import Message
-from .prompt_functions import PromptFunctions
-from .rendered_prompt_section import RenderedPromptSection
+from ....state import Memory
+from ...tokenizers import Tokenizer
+from ..message import Message
+from ..prompt_functions import PromptFunctions
+from ..rendered_prompt_section import RenderedPromptSection
 
 
 class PromptSection(ABC):

python/packages/ai/teams/ai/prompts/prompt_section.py renamed to python/packages/ai/teams/ai/prompts/sections/prompt_section.py

@@ -10,12 +10,12 @@
 
 from botbuilder.core import TurnContext
 
-from ...state import Memory
-from ..tokenizers import Tokenizer
-from .message import Message, MessageContentParts, TextContentPart
-from .prompt_functions import PromptFunctions
+from ....state import Memory
+from ...tokenizers import Tokenizer
+from ..message import Message, MessageContentParts, TextContentPart
+from ..prompt_functions import PromptFunctions
+from ..rendered_prompt_section import RenderedPromptSection
 from .prompt_section import PromptSection
-from .rendered_prompt_section import RenderedPromptSection
 
 
 class PromptSectionBase(PromptSection):