confamnode 0.2.3__tar.gz → 0.2.5__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- confamnode-0.2.5/LICENSE +201 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/PKG-INFO +29 -2
- {confamnode-0.2.3 → confamnode-0.2.5}/README.md +27 -1
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/__init__.py +1 -1
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/client.py +20 -0
- confamnode-0.2.5/confamnode/utils.py +48 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/pyproject.toml +1 -1
- confamnode-0.2.5/tests/test_cache_flag.py +74 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_client_errors.py +11 -5
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_utils.py +21 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/uv.lock +1 -1
- confamnode-0.2.3/confamnode/utils.py +0 -26
- {confamnode-0.2.3 → confamnode-0.2.5}/.gitignore +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/.python-version +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/ansa.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/builders.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/config.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/exceptions.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/models.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/confamnode/registry.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/__init__.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_ansa.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_client.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_exceptions.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_gist.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_init.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_models.py +0 -0
- {confamnode-0.2.3 → confamnode-0.2.5}/tests/test_stream.py +0 -0
confamnode-0.2.5/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright [yyyy] [name of copyright owner]
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: confamnode
|
|
3
|
-
Version: 0.2.
|
|
3
|
+
Version: 0.2.5
|
|
4
4
|
Summary: The Nigerian AI inference gateway
|
|
5
5
|
Project-URL: Repository, https://github.com/confamnodeai/confamnode
|
|
6
6
|
Project-URL: Bug Tracker, https://github.com/confamnodeai/confamnode/issues
|
|
7
7
|
Author-email: JoTeq the First <hello@confamnode.com>
|
|
8
8
|
License: Apache-2.0
|
|
9
|
+
License-File: LICENSE
|
|
9
10
|
Keywords: ai,confamnode,inference,joteq,llm,nigeria
|
|
10
11
|
Classifier: Development Status :: 3 - Alpha
|
|
11
12
|
Classifier: Intended Audience :: Developers
|
|
@@ -253,6 +254,32 @@ ansa = client.gist(
|
|
|
253
254
|
|
|
254
255
|
---
|
|
255
256
|
|
|
257
|
+
## Caching
|
|
258
|
+
|
|
259
|
+
Caching is controlled **per request** and is **off by default** — every call returns a fresh response, even when the request is identical. This keeps data-generation loops and any workflow that resends the same prompt from getting the same cached answer back each time.
|
|
260
|
+
|
|
261
|
+
Pass `cache=True` to read from and write to the cache — useful for idempotent lookups or to save cost on repeated queries:
|
|
262
|
+
|
|
263
|
+
```python
|
|
264
|
+
# Default — caching off, fresh response every call
|
|
265
|
+
ansa = client.gist(
|
|
266
|
+
model="confam-speed",
|
|
267
|
+
messages="How you dey?"
|
|
268
|
+
)
|
|
269
|
+
|
|
270
|
+
# Enable caching — use a stored response when the request matches,
|
|
271
|
+
# and store this response for next time
|
|
272
|
+
ansa = client.gist(
|
|
273
|
+
model="confam-speed",
|
|
274
|
+
messages="How you dey?",
|
|
275
|
+
cache=True
|
|
276
|
+
)
|
|
277
|
+
```
|
|
278
|
+
|
|
279
|
+
A cache hit is typically returned near-instantly and at little or no token cost — a quick way to confirm caching is active.
|
|
280
|
+
|
|
281
|
+
---
|
|
282
|
+
|
|
256
283
|
## Reasoning Models
|
|
257
284
|
|
|
258
285
|
Enable extended thinking for complex problems:
|
|
@@ -340,7 +367,7 @@ For enterprise clients running ConfamNode on private infrastructure:
|
|
|
340
367
|
```python
|
|
341
368
|
client = ConfamNode(
|
|
342
369
|
api_key="confam-xxx",
|
|
343
|
-
base_url="http://your-private-server:
|
|
370
|
+
base_url="http://your-private-server:4000/v1"
|
|
344
371
|
)
|
|
345
372
|
```
|
|
346
373
|
|
|
@@ -230,6 +230,32 @@ ansa = client.gist(
|
|
|
230
230
|
|
|
231
231
|
---
|
|
232
232
|
|
|
233
|
+
## Caching
|
|
234
|
+
|
|
235
|
+
Caching is controlled **per request** and is **off by default** — every call returns a fresh response, even when the request is identical. This keeps data-generation loops and any workflow that resends the same prompt from getting the same cached answer back each time.
|
|
236
|
+
|
|
237
|
+
Pass `cache=True` to read from and write to the cache — useful for idempotent lookups or to save cost on repeated queries:
|
|
238
|
+
|
|
239
|
+
```python
|
|
240
|
+
# Default — caching off, fresh response every call
|
|
241
|
+
ansa = client.gist(
|
|
242
|
+
model="confam-speed",
|
|
243
|
+
messages="How you dey?"
|
|
244
|
+
)
|
|
245
|
+
|
|
246
|
+
# Enable caching — use a stored response when the request matches,
|
|
247
|
+
# and store this response for next time
|
|
248
|
+
ansa = client.gist(
|
|
249
|
+
model="confam-speed",
|
|
250
|
+
messages="How you dey?",
|
|
251
|
+
cache=True
|
|
252
|
+
)
|
|
253
|
+
```
|
|
254
|
+
|
|
255
|
+
A cache hit is typically returned near-instantly and at little or no token cost — a quick way to confirm caching is active.
|
|
256
|
+
|
|
257
|
+
---
|
|
258
|
+
|
|
233
259
|
## Reasoning Models
|
|
234
260
|
|
|
235
261
|
Enable extended thinking for complex problems:
|
|
@@ -317,7 +343,7 @@ For enterprise clients running ConfamNode on private infrastructure:
|
|
|
317
343
|
```python
|
|
318
344
|
client = ConfamNode(
|
|
319
345
|
api_key="confam-xxx",
|
|
320
|
-
base_url="http://your-private-server:
|
|
346
|
+
base_url="http://your-private-server:4000/v1"
|
|
321
347
|
)
|
|
322
348
|
```
|
|
323
349
|
|
|
@@ -35,6 +35,7 @@ class ConfamNode:
|
|
|
35
35
|
model: str,
|
|
36
36
|
messages: Union[str, List[Dict[str, str]]],
|
|
37
37
|
system: str | None = "default",
|
|
38
|
+
cache: bool = False,
|
|
38
39
|
**kwargs
|
|
39
40
|
) -> "Ansa | ConfamStream":
|
|
40
41
|
if model not in VALID_MODELS:
|
|
@@ -60,6 +61,25 @@ class ConfamNode:
|
|
|
60
61
|
else:
|
|
61
62
|
body["system"] = system # None or custom string
|
|
62
63
|
|
|
64
|
+
# Caching is controlled per request. By default the SDK opts OUT, so
|
|
65
|
+
# identical requests (same model + messages + system) each return a
|
|
66
|
+
# FRESH response -- important for data-generation loops that resend the
|
|
67
|
+
# same prompt expecting varied output. Pass cache=True to read from and
|
|
68
|
+
# write to the cache (idempotent lookups, cost savings on repeats).
|
|
69
|
+
#
|
|
70
|
+
# These flags only tell the gateway whether to use a cache for THIS
|
|
71
|
+
# request; whether one exists at all is a gateway-side capability.
|
|
72
|
+
if cache:
|
|
73
|
+
body["cache"] = {
|
|
74
|
+
"no-cache": False, # Cache the response
|
|
75
|
+
"no-store": False # Store the response
|
|
76
|
+
}
|
|
77
|
+
else:
|
|
78
|
+
body["cache"] = {
|
|
79
|
+
"no-cache": True, # Skip cache check, get fresh response
|
|
80
|
+
"no-store": True # Don't cache this response
|
|
81
|
+
}
|
|
82
|
+
|
|
63
83
|
if kwargs.get("stream", False):
|
|
64
84
|
http_client = httpx.Client(
|
|
65
85
|
timeout=httpx.Timeout(DEFAULT_TIMEOUT, connect=DEFAULT_CONNECT_TIMEOUT)
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"""
|
|
2
|
+
Small internal helpers shared across the confamnode client.
|
|
3
|
+
"""
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
import re
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
def extract_error(response) -> str:
|
|
10
|
+
"""
|
|
11
|
+
Best-effort error detail from a non-2xx response, WITHOUT raising.
|
|
12
|
+
|
|
13
|
+
The server's normal error shape is {"detail": "..."}, but gateway-level
|
|
14
|
+
errors (e.g. a 429 throttle, a 502/504 from a proxy, a 524 origin timeout)
|
|
15
|
+
often return an empty or non-JSON body. Calling response.json() directly on
|
|
16
|
+
those bodies raises JSONDecodeError and swallows the status code -- the one
|
|
17
|
+
thing the caller actually needs. So we parse defensively and always fall
|
|
18
|
+
back to something readable.
|
|
19
|
+
|
|
20
|
+
HTML error pages (Cloudflare, nginx, ...) are summarised to their <title>
|
|
21
|
+
rather than dumped in full, so error messages and logs stay readable.
|
|
22
|
+
"""
|
|
23
|
+
# 1. Normal JSON error shape.
|
|
24
|
+
try:
|
|
25
|
+
payload = response.json()
|
|
26
|
+
if isinstance(payload, dict):
|
|
27
|
+
detail = payload.get("detail") or payload.get("error") or payload.get("message")
|
|
28
|
+
if detail:
|
|
29
|
+
return str(detail)
|
|
30
|
+
except Exception:
|
|
31
|
+
pass
|
|
32
|
+
|
|
33
|
+
text = (getattr(response, "text", "") or "").strip()
|
|
34
|
+
if not text:
|
|
35
|
+
return "no response body"
|
|
36
|
+
|
|
37
|
+
# 2. HTML error page: the full page is noise. Pull the <title>, which
|
|
38
|
+
# carries the human-readable status (e.g. "524: A timeout occurred").
|
|
39
|
+
if "<html" in text[:200].lower() or "<!doctype html" in text[:200].lower():
|
|
40
|
+
m = re.search(r"<title[^>]*>(.*?)</title>", text, re.IGNORECASE | re.DOTALL)
|
|
41
|
+
if m:
|
|
42
|
+
title = re.sub(r"\s+", " ", m.group(1)).strip()
|
|
43
|
+
if title:
|
|
44
|
+
return title
|
|
45
|
+
return "HTML error page (no title)"
|
|
46
|
+
|
|
47
|
+
# 3. Plain-text body: return it, truncated so we never dump a wall.
|
|
48
|
+
return text if len(text) <= 300 else text[:297] + "..."
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"""
|
|
2
|
+
Tests for the per-request cache flag on ConfamNode.gist().
|
|
3
|
+
|
|
4
|
+
Caching is opt-OUT by default: identical requests must each return a fresh
|
|
5
|
+
response (critical for data-generation loops). cache=True flips the request
|
|
6
|
+
to read-from + write-to the cache. These tests pin down the exact payload
|
|
7
|
+
sent in each case so a future refactor can't silently flip the default.
|
|
8
|
+
|
|
9
|
+
No network: httpx.post is monkeypatched to capture the request body.
|
|
10
|
+
"""
|
|
11
|
+
import httpx
|
|
12
|
+
import pytest
|
|
13
|
+
|
|
14
|
+
from confamnode.client import ConfamNode
|
|
15
|
+
from confamnode.registry import VALID_MODELS
|
|
16
|
+
|
|
17
|
+
API_KEY = "confam-test"
|
|
18
|
+
MODEL = next(iter(VALID_MODELS))
|
|
19
|
+
|
|
20
|
+
CACHE_OFF = {"no-cache": True, "no-store": True} # skip read + skip store
|
|
21
|
+
CACHE_ON = {"no-cache": False, "no-store": False} # use + store
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
@pytest.fixture
|
|
25
|
+
def captured_body(monkeypatch):
|
|
26
|
+
"""Patch httpx.post to record the JSON body and return a valid 200."""
|
|
27
|
+
box = {}
|
|
28
|
+
|
|
29
|
+
def fake_post(url, headers=None, json=None, timeout=None):
|
|
30
|
+
box["body"] = json
|
|
31
|
+
|
|
32
|
+
class _Resp:
|
|
33
|
+
status_code = 200
|
|
34
|
+
text = ""
|
|
35
|
+
|
|
36
|
+
def json(self):
|
|
37
|
+
return {
|
|
38
|
+
"choices": [{"message": {"content": "hi"}, "finish_reason": "stop"}],
|
|
39
|
+
"usage": {},
|
|
40
|
+
"confam": {"cost": {"naira": 0.0}},
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
return _Resp()
|
|
44
|
+
|
|
45
|
+
monkeypatch.setattr(httpx, "post", fake_post)
|
|
46
|
+
return box
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
def _gist(**kwargs):
|
|
50
|
+
ConfamNode(api_key=API_KEY).gist(model=MODEL, messages="x", **kwargs)
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
def test_cache_off_by_default(captured_body):
|
|
54
|
+
_gist()
|
|
55
|
+
assert captured_body["body"]["cache"] == CACHE_OFF
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
def test_cache_true_uses_and_stores(captured_body):
|
|
59
|
+
_gist(cache=True)
|
|
60
|
+
assert captured_body["body"]["cache"] == CACHE_ON
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
def test_cache_false_is_explicit_off(captured_body):
|
|
64
|
+
_gist(cache=False)
|
|
65
|
+
assert captured_body["body"]["cache"] == CACHE_OFF
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
def test_cache_field_always_present(captured_body):
|
|
69
|
+
# The request should always state its caching intent in both directions,
|
|
70
|
+
# never leave it implied by omission.
|
|
71
|
+
_gist()
|
|
72
|
+
assert "cache" in captured_body["body"]
|
|
73
|
+
_gist(cache=True)
|
|
74
|
+
assert "cache" in captured_body["body"]
|
|
@@ -58,14 +58,20 @@ def test_json_detail_error_surfaces_detail(monkeypatch):
|
|
|
58
58
|
assert "invalid model" in str(exc.value)
|
|
59
59
|
|
|
60
60
|
|
|
61
|
-
def
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
def test_html_gateway_error_surfaces_title(monkeypatch):
|
|
62
|
+
html = (
|
|
63
|
+
"<!DOCTYPE html><html><head>"
|
|
64
|
+
"<title>confamnode.com | 524: A timeout occurred</title>"
|
|
65
|
+
"</head><body>...</body></html>"
|
|
66
|
+
)
|
|
67
|
+
_patch_post(monkeypatch, FakeResponse(524, json_raises=True, text=html))
|
|
64
68
|
client = ConfamNode(api_key=API_KEY)
|
|
65
69
|
with pytest.raises(Exception) as exc:
|
|
66
70
|
client.gist(model=MODEL, messages="hi")
|
|
67
|
-
|
|
68
|
-
assert "
|
|
71
|
+
msg = str(exc.value)
|
|
72
|
+
assert "524" in msg
|
|
73
|
+
assert "A timeout occurred" in msg
|
|
74
|
+
assert "<html" not in msg # the page itself must NOT be dumped into the error
|
|
69
75
|
|
|
70
76
|
|
|
71
77
|
def test_success_path_still_returns_ansa(monkeypatch):
|
|
@@ -29,6 +29,27 @@ def test_non_json_text_body_is_returned_stripped():
|
|
|
29
29
|
assert extract_error(_Resp(json_raises=True, text=" upstream timeout ")) == "upstream timeout"
|
|
30
30
|
|
|
31
31
|
|
|
32
|
+
def test_html_error_page_summarised_to_title():
|
|
33
|
+
# A Cloudflare 524 page: don't dump the whole page, surface the <title>.
|
|
34
|
+
html = (
|
|
35
|
+
"<!DOCTYPE html><html><head>"
|
|
36
|
+
"<title>confamnode.com | 524: A timeout occurred</title>"
|
|
37
|
+
"</head><body>...lots of markup...</body></html>"
|
|
38
|
+
)
|
|
39
|
+
assert extract_error(_Resp(json_raises=True, text=html)) == "confamnode.com | 524: A timeout occurred"
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
def test_html_without_title_falls_back():
|
|
43
|
+
html = "<html><body>502 Bad Gateway</body></html>"
|
|
44
|
+
assert extract_error(_Resp(json_raises=True, text=html)) == "HTML error page (no title)"
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def test_long_plain_text_is_truncated():
|
|
48
|
+
body = "x" * 500
|
|
49
|
+
out = extract_error(_Resp(json_raises=True, text=body))
|
|
50
|
+
assert len(out) == 300 and out.endswith("...")
|
|
51
|
+
|
|
52
|
+
|
|
32
53
|
def test_detail_key_is_preferred():
|
|
33
54
|
assert extract_error(_Resp(payload={"detail": "invalid model"})) == "invalid model"
|
|
34
55
|
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
"""
|
|
2
|
-
Small internal helpers shared across the confamnode client.
|
|
3
|
-
"""
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
def extract_error(response) -> str:
|
|
7
|
-
"""
|
|
8
|
-
Best-effort error detail from a non-2xx response, WITHOUT raising.
|
|
9
|
-
|
|
10
|
-
The server's normal error shape is {"detail": "..."}, but gateway-level
|
|
11
|
-
errors (e.g. a 429 throttle, a 502/504 from a proxy) often return an
|
|
12
|
-
empty or non-JSON body. Calling response.json() directly on those bodies
|
|
13
|
-
raises JSONDecodeError and swallows the status code -- the one thing the
|
|
14
|
-
caller actually needs. So we parse defensively and always fall back to
|
|
15
|
-
the raw text, then to a status-only message.
|
|
16
|
-
"""
|
|
17
|
-
try:
|
|
18
|
-
payload = response.json()
|
|
19
|
-
if isinstance(payload, dict):
|
|
20
|
-
detail = payload.get("detail") or payload.get("error") or payload.get("message")
|
|
21
|
-
if detail:
|
|
22
|
-
return str(detail)
|
|
23
|
-
except Exception:
|
|
24
|
-
pass
|
|
25
|
-
text = (getattr(response, "text", "") or "").strip()
|
|
26
|
-
return text or "no response body"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|