freeplay 0.2.35__py3-none-any.whl → 0.2.37__py3-none-any.whl

freeplay/flavors.py

@@ -50,7 +50,7 @@ class Flavor(ABC):
         pass
 
     @abstractmethod
-    def to_llm_syntax(self, messages: List[ChatMessage]) -> str | List[ChatMessage]:
+    def to_llm_syntax(self, messages: List[ChatMessage]) -> Union[str, List[ChatMessage]]:
         raise NotImplementedError()
 
     @abstractmethod

freeplay/model.py

@@ -3,7 +3,7 @@ from typing import List, Union, Any, Dict, Mapping
 
 from pydantic import RootModel
 
-InputValue = Union[str, int, bool, dict[str, Any], list[Any]]
+InputValue = Union[str, int, bool, Dict[str, Any], List[Any]]
 InputVariable = RootModel[Union[Dict[str, "InputVariable"], List["InputVariable"], str, int, bool, float]]
 InputVariable.model_rebuild()
 

freeplay/support.py

@@ -28,7 +28,7 @@ class TestRunResponse:
     def __init__(
             self,
             test_run_id: str,
-            test_cases: list[JsonDom]
+            test_cases: List[JsonDom]
     ):
         self.test_cases = [
             TestCaseTestRunResponse(test_case)

freeplay/thin/freeplay_thin.py

@@ -1,8 +1,10 @@
+from typing import Optional
+
 from freeplay.errors import FreeplayConfigurationError
 from freeplay.record import DefaultRecordProcessor
 from freeplay.support import CallSupport
 from freeplay.thin.resources.customer_feedback import CustomerFeedback
-from freeplay.thin.resources.prompts import Prompts
+from freeplay.thin.resources.prompts import Prompts, APITemplateResolver, TemplateResolver
 from freeplay.thin.resources.recordings import Recordings
 from freeplay.thin.resources.sessions import Sessions
 from freeplay.thin.resources.test_runs import TestRuns
@@ -12,7 +14,8 @@ class Freeplay:
     def __init__(
             self,
             freeplay_api_key: str,
-            api_base: str
+            api_base: str,
+            template_resolver: Optional[TemplateResolver] = None
     ) -> None:
         if not freeplay_api_key or not freeplay_api_key.strip():
             raise FreeplayConfigurationError("Freeplay API key not set. It must be set to the Freeplay API.")
@@ -22,9 +25,15 @@ class Freeplay:
         self.freeplay_api_key = freeplay_api_key
         self.api_base = api_base
 
+        resolver: TemplateResolver
+        if template_resolver is None:
+            resolver = APITemplateResolver(self.call_support)
+        else:
+            resolver = template_resolver
+
         # Resources ========
         self.customer_feedback = CustomerFeedback(self.call_support)
-        self.prompts = Prompts(self.call_support)
+        self.prompts = Prompts(self.call_support, resolver)
         self.recordings = Recordings(self.call_support)
         self.sessions = Sessions()
         self.test_runs = TestRuns(self.call_support)

freeplay/thin/resources/prompts.py

@@ -1,8 +1,10 @@
 import json
+from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Optional, List, Union, cast
+from pathlib import Path
+from typing import Dict, Optional, List, Union, cast
 
-from freeplay.completions import PromptTemplates, ChatMessage
+from freeplay.completions import PromptTemplates, ChatMessage, PromptTemplateWithMetadata
 from freeplay.errors import FreeplayConfigurationError
 from freeplay.flavors import Flavor
 from freeplay.llm_parameters import LLMParameters
@@ -27,8 +29,8 @@ class FormattedPrompt:
     def __init__(
             self,
             prompt_info: PromptInfo,
-            messages: List[dict[str, str]],
-            formatted_prompt: Union[str, List[dict[str, str]]]
+            messages: List[Dict[str, str]],
+            formatted_prompt: Union[str, List[Dict[str, str]]]
     ):
         self.prompt_info = prompt_info
         self.messages = messages
@@ -36,8 +38,8 @@ class FormattedPrompt:
 
     def all_messages(
             self,
-            new_message: dict[str, str]
-    ) -> List[dict[str, str]]:
+            new_message: Dict[str, str]
+    ) -> List[Dict[str, str]]:
         return self.messages + [new_message]
 
 
@@ -45,7 +47,7 @@ class BoundPrompt:
     def __init__(
             self,
             prompt_info: PromptInfo,
-            messages: List[dict[str, str]]
+            messages: List[Dict[str, str]]
     ):
         self.prompt_info = prompt_info
         self.messages = messages
@@ -61,7 +63,7 @@ class BoundPrompt:
         return FormattedPrompt(
             self.prompt_info,
             self.messages,
-            cast(Union[str, List[dict[str, str]]], llm_format)
+            cast(Union[str, List[Dict[str, str]]], llm_format)
         )
 
 
@@ -69,7 +71,7 @@ class TemplatePrompt:
     def __init__(
             self,
             prompt_info: PromptInfo,
-            messages: List[dict[str, str]]
+            messages: List[Dict[str, str]]
     ):
         self.prompt_info = prompt_info
         self.messages = messages
@@ -82,19 +84,85 @@ class TemplatePrompt:
         return BoundPrompt(self.prompt_info, bound_messages)
 
 
+class TemplateResolver(ABC):
+    @abstractmethod
+    def get_prompts(self, project_id: str, environment: str) -> PromptTemplates:
+        pass
+
+
+class FilesystemTemplateResolver(TemplateResolver):
+
+    def __init__(self, freeplay_directory: Path):
+        FilesystemTemplateResolver.__validate_freeplay_directory(freeplay_directory)
+        self.prompts_directory = freeplay_directory / "freeplay" / "prompts"
+
+    def get_prompts(self, project_id: str, environment: str) -> PromptTemplates:
+        self.__validate_prompt_directory(project_id, environment)
+
+        directory = self.prompts_directory / project_id / environment
+        prompt_file_paths = directory.glob("*.json")
+
+        prompt_list = []
+        for prompt_file_path in prompt_file_paths:
+            json_dom = json.loads(prompt_file_path.read_text())
+
+            prompt_list.append(PromptTemplateWithMetadata(
+                prompt_template_id=json_dom.get('prompt_template_id'),
+                prompt_template_version_id=json_dom.get('prompt_template_version_id'),
+                name=json_dom.get('name'),
+                content=json_dom.get('content'),
+                flavor_name=json_dom.get('metadata').get('flavor_name'),
+                params=json_dom.get('metadata').get('params')
+            ))
+
+        return PromptTemplates(prompt_list)
+
+    @staticmethod
+    def __validate_freeplay_directory(freeplay_directory: Path) -> None:
+        if not freeplay_directory.is_dir():
+            raise FreeplayConfigurationError(
+                "Path for prompt templates is not a valid directory (%s)" % freeplay_directory
+            )
+
+        prompts_directory = freeplay_directory / "freeplay" / "prompts"
+        if not prompts_directory.is_dir():
+            raise FreeplayConfigurationError(
+                "Invalid path for prompt templates (%s). "
+                "Did not find a freeplay/prompts directory underneath." % freeplay_directory
+            )
+
+    def __validate_prompt_directory(self, project_id: str, environment: str) -> None:
+        maybe_prompt_dir = self.prompts_directory / project_id / environment
+        if not maybe_prompt_dir.is_dir():
+            raise FreeplayConfigurationError(
+                "Could not find prompt template directory for project ID %s and environment %s." %
+                (project_id, environment)
+            )
+
+
+class APITemplateResolver(TemplateResolver):
+
+    def __init__(self, call_support: CallSupport):
+        self.call_support = call_support
+
+    def get_prompts(self, project_id: str, environment: str) -> PromptTemplates:
+        return self.call_support.get_prompts(
+            project_id=project_id,
+            tag=environment
+        )
+
+
 class Prompts:
-    def __init__(self, call_support: CallSupport) -> None:
+    def __init__(self, call_support: CallSupport, template_resolver: TemplateResolver) -> None:
         self.call_support = call_support
+        self.template_resolver = template_resolver
 
     def get_all(self, project_id: str, environment: str) -> PromptTemplates:
         return self.call_support.get_prompts(project_id=project_id, tag=environment)
 
     def get(self, project_id: str, template_name: str, environment: str) -> TemplatePrompt:
-        prompt_template = self.call_support.get_prompt(
-            project_id=project_id,
-            template_name=template_name,
-            environment=environment
-        )
+        prompt_templates = self.template_resolver.get_prompts(project_id, environment)
+        prompt_template = self.call_support.find_template_by_name(prompt_templates, template_name)
 
         messages = json.loads(prompt_template.content)
 

freeplay/thin/resources/recordings.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from dataclasses import dataclass
-from typing import Optional, List
+from typing import Dict, Optional, List
 
 from freeplay import api_support
 from freeplay.completions import PromptTemplateWithMetadata, OpenAIFunctionCall
@@ -50,7 +50,7 @@ class TestRunInfo:
 
 @dataclass
 class RecordPayload:
-    all_messages: List[dict[str, str]]
+    all_messages: List[Dict[str, str]]
     inputs: InputVariables
 
     session_info: SessionInfo

{freeplay-0.2.35.dist-info → freeplay-0.2.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freeplay
-Version: 0.2.35
+Version: 0.2.37
 Summary: 
 License: MIT
 Author: FreePlay Engineering
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: anthropic (>=0.7.7,<0.8.0)
 Requires-Dist: click (==8.1.7)
 Requires-Dist: dacite (>=1.8.0,<2.0.0)

{freeplay-0.2.35.dist-info → freeplay-0.2.37.dist-info}/RECORD

@@ -2,26 +2,26 @@ freeplay/__init__.py,sha256=74A9S9hmLq9BNHsdx0-37yDxlSukudNl9bJ0TE60Z30,61
 freeplay/api_support.py,sha256=u8b1e9prlR4_qOcqmFduU7U35ubQt1tWJ6bXhUdsv0c,2240
 freeplay/completions.py,sha256=F1rMBtQaCtn0rBQqvCurkV25g8gLtwnEod5rRvf-txY,1176
 freeplay/errors.py,sha256=bPqsw32YX-xSr7O-G49M0sSFF7mq-YF1WGq928UV47s,631
-freeplay/flavors.py,sha256=XroBKT8Nf92VTsuC261Nceo9f9stkkpC5CXbi8y4NEs,17236
+freeplay/flavors.py,sha256=IytHc1C1q0ZTJn9T6Mt6oJn6eeTqQBc-9habH7p-T80,17242
 freeplay/freeplay.py,sha256=BLlr4YXh3a624xcM93KvZGsiIGSMrIMFM07lLyVCIao,17089
 freeplay/freeplay_cli.py,sha256=k9QPBedcFqpy9Ec9k7DT_y-NpVxHqRF5jKPTaQBBs1Q,3863
 freeplay/llm_parameters.py,sha256=bQbfuC8EICF0XMZQa5pwI3FkQqxmCUVqHO3gYHy3Tg8,898
-freeplay/model.py,sha256=kVARXUEJKbhOdWz7T8eR7npTPXlpaY9wWaEzJvbIvOU,534
+freeplay/model.py,sha256=7BRAuyxsLl8X-ue8wXPmAiKYp4OaYI-HkaGc3t5qtMU,534
 freeplay/provider_config.py,sha256=hruf3Khusrwb76_-hv7ouuxmvJuaRyC1UxIw7XlJx8A,1416
 freeplay/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/record.py,sha256=69vO9vYGFL8gLrvRqLzlvodVNo05GOzKDJnCyhUha08,3615
-freeplay/support.py,sha256=gMPh8papI5AsXQp0clpsbbQP0Bz6HreP5aNaD3pefW0,13083
+freeplay/support.py,sha256=KP_rRgn0gh6n5BOGGExHO9pip9Pj22_WSvF6v106kX8,13083
 freeplay/thin/__init__.py,sha256=XgU_eMmTpOPCa9w5mVOyxPgwAgRFfVdRWDazYGYZtQ0,351
-freeplay/thin/freeplay_thin.py,sha256=ck8TcvJLV3DMx66j6YSoare_XipubCN1ymMoqssQmNs,1278
+freeplay/thin/freeplay_thin.py,sha256=raVESB8VWoCSeCsGPDr-DOx37WXi8D27odKnOeDWwV0,1613
 freeplay/thin/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 freeplay/thin/resources/customer_feedback.py,sha256=aTM7Eez7iYmjXSpRqkHxf4pi6xBrzVnMiQCEJVfPGvg,527
-freeplay/thin/resources/prompts.py,sha256=YemDMV7a_qFaIzOoXOgQZZxtp0vxGsnQniOAqD_-uuk,4254
-freeplay/thin/resources/recordings.py,sha256=PZ6V-ajFLQhDW5GlN6P0zQeFIzu-l18G3m_HLx_2SQg,5041
+freeplay/thin/resources/prompts.py,sha256=CRsvrIIe59WHTAA1PFvfNOK2x9S-C9zCz_z8XzsIg4w,7142
+freeplay/thin/resources/recordings.py,sha256=utrGTjPPiNt1btI0Hiti9s7VvCYFWqitAx35zrXrOfg,5047
 freeplay/thin/resources/sessions.py,sha256=ioWdeTM9BSrEWKrFH66ysQIw5kCTlCVopJDmWtFgHz0,868
 freeplay/thin/resources/test_runs.py,sha256=L8A1tQHzYg9UmLgbNFtFa8pGXqyrcoyTtSE0sSnd9UE,1267
 freeplay/utils.py,sha256=cRCCIzVqWNDKlTI-DDhXGyCkplbd-X4qzDs__aUpvww,1840
-freeplay-0.2.35.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
-freeplay-0.2.35.dist-info/METADATA,sha256=S906kzbHL8_vuCWb-WY5rNC5RVdwk0XXebkTiBzHkZg,1625
-freeplay-0.2.35.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-freeplay-0.2.35.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
-freeplay-0.2.35.dist-info/RECORD,,
+freeplay-0.2.37.dist-info/LICENSE,sha256=_jzIw45hB1XHGxiQ8leZ0GH_X7bR_a8qgxaqnHbCUOo,1064
+freeplay-0.2.37.dist-info/METADATA,sha256=0QabpMND4wK9yg-3bGxZZJzMKVTikH0v1iLf0HOgyiE,1676
+freeplay-0.2.37.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+freeplay-0.2.37.dist-info/entry_points.txt,sha256=32s3rf2UUCqiJT4jnClEXZhdXlvl30uwpcxz-Gsy4UU,54
+freeplay-0.2.37.dist-info/RECORD,,

{freeplay-0.2.35.dist-info → freeplay-0.2.37.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.8.1
 Root-Is-Purelib: true
 Tag: py3-none-any