Removed erroneous print statement, added README to pip, renamed formm…

…at -> format, skipped one test
KillianLucas · Nov 3, 2023 · 1f2af46 · 1f2af46
1 parent 587996c
commit 1f2af46
Show file tree

Hide file tree

Showing 5 changed files with 485 additions and 208 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,8 @@
 name = "tokentrim"
 version = "0.1.13"
 description = "Easily trim 'messages' arrays for use with GPTs."
-authors = ["Killian Lucas <killian@drinkwater.ai>"]
+authors = ["Killian Lucas <killian@openinterpreter.com>"]
+readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
@@ -13,4 +14,4 @@ pytest = "^7.4.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"
diff --git a/tests/test_format_function_calls.py b/tests/test_format_function_calls.py
@@ -1,53 +1,56 @@
-
-from tokentrim.formmat_function_calls import format_tool
+from tokentrim.format_function_calls import format_tool
 
 
 def test_simple_tool():
-    simple_tool = dict(
-        name="get_location",
-        description="Get the user's location",
-        parameters={"type": "object", "properties": {}},
-    )
-    actual = format_tool(simple_tool)
-    expected = """// Get the user's location
+  simple_tool = dict(
+    name="get_location",
+    description="Get the user's location",
+    parameters={
+      "type": "object",
+      "properties": {}
+    },
+  )
+  actual = format_tool(simple_tool)
+  expected = """// Get the user's location
 type get_location = () => any;
 
 """
-    assert actual == expected
+  assert actual == expected
+
 
 def test_create_model_tool():
-    create_model_tool = dict(
-        name="create_model",
-        description="Create a new conversational agent",
-        parameters={
-            "title": "GptParams",
-            "type": "object",
-            "properties": {
-                "temperature": {
-                    "title": "Temperature",
-                    "default": 1,
-                    "minimum": 0,
-                    "maximum": 2,
-                    "type": "number",
-                },
-                "max_tokens": {
-                    "title": "Max Tokens",
-                    "description": "The maximum response length of the model",
-                    "default": 512,
-                    "type": "integer",
-                },
-                "reserve_tokens": {
-                    "title": "Reserve Tokens",
-                    "description": "Number of tokens reserved for the model's output",
-                    "default": 512,
-                    "type": "integer",
-                },
-            },
-            "additionalProperties": False,
+  create_model_tool = dict(
+    name="create_model",
+    description="Create a new conversational agent",
+    parameters={
+      "title": "GptParams",
+      "type": "object",
+      "properties": {
+        "temperature": {
+          "title": "Temperature",
+          "default": 1,
+          "minimum": 0,
+          "maximum": 2,
+          "type": "number",
+        },
+        "max_tokens": {
+          "title": "Max Tokens",
+          "description": "The maximum response length of the model",
+          "default": 512,
+          "type": "integer",
         },
-    )
-    actual = format_tool(create_model_tool)
-    expected = """// Create a new conversational agent
+        "reserve_tokens": {
+          "title": "Reserve Tokens",
+          "description": "Number of tokens reserved for the model's output",
+          "default": 512,
+          "type": "integer",
+        },
+      },
+      "additionalProperties": False,
+    },
+  )
+  actual = format_tool(create_model_tool)
+  expected = """// Create a new conversational agent
 type create_model = (_: {
 temperature?: number, // default: 1.0
 // The maximum response length of the model
@@ -57,85 +60,101 @@ def test_create_model_tool():
 }) => any;
 
 """
-    assert actual == expected
+  assert actual == expected
 
 
 def test_send_message_tool():
-    send_message_tool = dict(
-        name="send_message",
-        description="Send a new message",
-        parameters={
-            "title": "ConversationCreate",
-            "type": "object",
-            "properties": {
-                "params": {"$ref": "#/definitions/ConversationParams"},
-                "messages": {
-                    "title": "Messages",
-                    "type": "array",
-                    "items": {"$ref": "#/definitions/MessageCreate"},
-                },
+  send_message_tool = dict(
+    name="send_message",
+    description="Send a new message",
+    parameters={
+      "title": "ConversationCreate",
+      "type": "object",
+      "properties": {
+        "params": {
+          "$ref": "#/definitions/ConversationParams"
+        },
+        "messages": {
+          "title": "Messages",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MessageCreate"
+          },
+        },
+      },
+      "required": ["params", "messages"],
+      "definitions": {
+        "ConversationParams": {
+          "title": "ConversationParams",
+          "description":
+          "Parameters to use for the conversation. Extra fields are permitted and\npassed to the model directly.",
+          "type": "object",
+          "properties": {
+            "model": {
+              "title": "Model",
+              "description": "Completion model to use for the conversation",
+              "pattern": "^.+:.+$",
+              "example": "openai:Gpt35Model",
+              "type": "string",
+            },
+            "model_params": {
+              "title": "Model Params",
+              "type": "object",
+              "properties": {},
+              "additionalProperties": True,
+            },
+            "features": {
+              "title": "Features",
+              "description":
+              "Set of enabled features for this conversation and the parameters for them.",
+              "example": {
+                "test:dummy_feature": {
+                  "enable_weather": True
+                }
+              },
+              "type": "object",
+            },
+          },
+          "required": ["model", "model_params", "features"],
+        },
+        "MessageRole": {
+          "title": "MessageRole",
+          "description": "An enumeration.",
+          "enum": ["user", "assistant", "system", "tool_call", "tool_result"],
+          "type": "string",
+        },
+        "MessageCreate": {
+          "title": "MessageCreate",
+          "type": "object",
+          "properties": {
+            "role": {
+              "$ref": "#/definitions/MessageRole"
+            },
+            "name": {
+              "title": "Name",
+              "description":
+              "\n            Sender of the message. For tool_call and tool_result, this is the\n            name of the tool being referenced. Otherwise, it is optional.\n            ",
+              "example": "user",
+              "type": "string",
             },
-            "required": ["params", "messages"],
-            "definitions": {
-                "ConversationParams": {
-                    "title": "ConversationParams",
-                    "description": "Parameters to use for the conversation. Extra fields are permitted and\npassed to the model directly.",
-                    "type": "object",
-                    "properties": {
-                        "model": {
-                            "title": "Model",
-                            "description": "Completion model to use for the conversation",
-                            "pattern": "^.+:.+$",
-                            "example": "openai:Gpt35Model",
-                            "type": "string",
-                        },
-                        "model_params": {
-                            "title": "Model Params",
-                            "type": "object",
-                            "properties": {},
-                            "additionalProperties": True,
-                        },
-                        "features": {
-                            "title": "Features",
-                            "description": "Set of enabled features for this conversation and the parameters for them.",
-                            "example": {"test:dummy_feature": {"enable_weather": True}},
-                            "type": "object",
-                        },
-                    },
-                    "required": ["model", "model_params", "features"],
-                },
-                "MessageRole": {
-                    "title": "MessageRole",
-                    "description": "An enumeration.",
-                    "enum": ["user", "assistant", "system", "tool_call", "tool_result"],
-                    "type": "string",
-                },
-                "MessageCreate": {
-                    "title": "MessageCreate",
-                    "type": "object",
-                    "properties": {
-                        "role": {"$ref": "#/definitions/MessageRole"},
-                        "name": {
-                            "title": "Name",
-                            "description": "\n            Sender of the message. For tool_call and tool_result, this is the\n            name of the tool being referenced. Otherwise, it is optional.\n            ",
-                            "example": "user",
-                            "type": "string",
-                        },
-                        "content": {
-                            "title": "Content",
-                            "description": "\n            Arbitrary data. For regular messages (not tool calls/results), this\n            must include a 'text' field containing the message text.\n            ",
-                            "example": {"text": "Why is the sky blue?"},
-                            "additionalProperties": True,
-                            "type": "object",
-                        },
-                    },
-                    "required": ["role", "content"],
-                },
+            "content": {
+              "title": "Content",
+              "description":
+              "\n            Arbitrary data. For regular messages (not tool calls/results), this\n            must include a 'text' field containing the message text.\n            ",
+              "example": {
+                "text": "Why is the sky blue?"
+              },
+              "additionalProperties": True,
+              "type": "object",
             },
+          },
+          "required": ["role", "content"],
         },
-    )
-    actual = format_tool(send_message_tool)
-    expected = """// Send a new message
+      },
+    },
+  )
+  actual = format_tool(send_message_tool)
+  expected = """// Send a new message
 type send_message = (_: {
 // Parameters to use for the conversation. Extra fields are permitted and
 // passed to the model directly.
@@ -151,4 +170,4 @@ def test_send_message_tool():
 }) => any;
 
 """
-    assert actual == expected
+  assert actual == expected