|
1 | 1 | import fnmatch |
2 | 2 | import json |
3 | | -from typing import Any, Generator, Generic, Mapping, Sequence, TypeVar |
| 3 | +from typing import Any, Generator, Generic, Sequence, TypeVar |
4 | 4 |
|
5 | 5 | from .pdl_ast import ( |
6 | 6 | ContributeTarget, |
@@ -106,42 +106,22 @@ def get_contribute_value( |
106 | 106 | return None |
107 | 107 |
|
108 | 108 |
|
109 | | -def messages_concat( |
| 109 | +def _messages_concat( |
110 | 110 | messages1: list[dict[str, Any]], messages2: list[dict[str, Any]] |
111 | 111 | ) -> list[dict[str, Any]]: |
112 | | - if len(messages1) == 0: |
113 | | - return messages2 |
114 | | - if len(messages2) == 0: |
115 | | - return messages1 |
116 | | - left = messages1[-1] |
117 | | - right = messages2[0] |
118 | | - if ( |
119 | | - left["role"] == right["role"] and simple_message(left) and simple_message(right) |
120 | | - ): # test that there are no other keys |
121 | | - return ( |
122 | | - messages1[:-1] |
123 | | - + [{"role": left["role"], "content": left["content"] + right["content"]}] |
124 | | - + messages2[1:] |
125 | | - ) |
126 | 112 | return messages1 + messages2 |
127 | 113 |
|
128 | 114 |
|
129 | 115 | def lazy_messages_concat( |
130 | 116 | messages1: LazyMessages, messages2: LazyMessages |
131 | 117 | ) -> LazyMessages: |
132 | | - return lazy_apply2(messages_concat, messages1, messages2) |
| 118 | + return lazy_apply2(_messages_concat, messages1, messages2) |
133 | 119 |
|
134 | 120 |
|
135 | 121 | def messages_to_str(messages: LazyMessages) -> str: |
136 | 122 | return "\n".join([str(msg) for msg in messages.result()]) |
137 | 123 |
|
138 | 124 |
|
139 | | -def simple_message(message: Mapping[str, Any]) -> bool: |
140 | | - if message.keys() == {"role", "content"} and message["content"] is not None: |
141 | | - return True |
142 | | - return False |
143 | | - |
144 | | - |
145 | 125 | def remove_none_values_from_message(message: dict) -> dict[str, Any]: |
146 | 126 | ret = {} |
147 | 127 | for key, value in message.items(): |
|
0 commit comments