Skip to content

Commit bf1fe5a

Browse files
jameszyaojameszyao
committed
feat: implement file upload with rest client
1 parent 9932123 commit bf1fe5a

File tree

9 files changed

+539
-418
lines changed

9 files changed

+539
-418
lines changed

‎examples/crud/retrieval_crud.ipynb‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,16 @@
283283
"# upload a file first\n",
284284
"from taskingai.file import upload_file\n",
285285
"\n",
286-
"file = upload_file(file=\"your file path\", purpose=\"record_file\")\n",
287-
"# or\n",
288-
"# file = upload_file(file=open(\"your file path\", \"rb\"), purpose=\"record_file\")\n",
289-
"print(f\"uploaded file id: {file.file_id}\")\n",
290-
"\n",
291-
"# create a new web record\n",
286+
"file = upload_file(file=open(\"YOUR_FILE_PATH\", \"rb\"), purpose=\"record_file\")\n",
287+
"print(f\"uploaded file id: {file.file_id}\")"
288+
]
289+
},
290+
{
291+
"cell_type": "code",
292+
"execution_count": null,
293+
"outputs": [],
294+
"source": [
295+
"# create a new file record\n",
292296
"record: Record = taskingai.retrieval.create_record(\n",
293297
" collection_id=collection.collection_id,\n",
294298
" type=\"file\",\n",
@@ -297,7 +301,24 @@
297301
" text_splitter={\"type\": \"token\", \"chunk_size\": 200, \"chunk_overlap\": 20},\n",
298302
")\n",
299303
"print(f\"created record: {record.record_id} for collection: {collection.collection_id}\\n\")"
300-
]
304+
],
305+
"metadata": {
306+
"collapsed": false
307+
},
308+
"id": "832ae91419da5493"
309+
},
310+
{
311+
"cell_type": "code",
312+
"execution_count": null,
313+
"outputs": [],
314+
"source": [
315+
"new_file = upload_file(file=open(\"NEW_FILE_PATH\", \"rb\"), purpose=\"record_file\")\n",
316+
"print(f\"new uploaded file id: {new_file.file_id}\")"
317+
],
318+
"metadata": {
319+
"collapsed": false
320+
},
321+
"id": "8176058e6c15a1e0"
301322
},
302323
{
303324
"cell_type": "code",
@@ -306,9 +327,6 @@
306327
"metadata": {},
307328
"outputs": [],
308329
"source": [
309-
"new_file = upload_file(file=\"new_file_path\", purpose=\"record_file\")\n",
310-
"print(f\"new uploaded file id: {new_file.file_id}\")\n",
311-
"\n",
312330
"# update record - file\n",
313331
"record = taskingai.retrieval.update_record(\n",
314332
" collection_id=collection.collection_id,\n",

‎requirements.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ python_dateutil>=2.5.3
44
setuptools>=21.0.0
55
httpx>=0.23.0
66
pydantic>=2.5.0
7-
wheel==0.43.0
8-
aiofiles==23.2.1
9-
aiohttp==3.9.5
10-
requests==2.31.0
7+
wheel>=0.43.0

‎taskingai/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from . import tool
44
from . import retrieval
55
from . import inference
6+
from . import file
67
from ._version import __version__
78

89
__all__ = [
@@ -11,4 +12,4 @@
1112
"retrieval",
1213
"inference",
1314
"__version__",
14-
]
15+
]

‎taskingai/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
__title__ = "taskingai"
2-
__version__ = "0.2.1"
2+
__version__ = "0.2.2"

‎taskingai/client/api_client.py‎

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import datetime
1010
import json
11-
import mimetypes
1211
import os
1312
import re
1413
import tempfile
@@ -101,32 +100,6 @@ def deserialize(self, response, response_type: Type[BaseModel]):
101100

102101
return response_type(**data)
103102

104-
def prepare_post_parameters(self, post_params=None, files=None):
105-
"""Builds form parameters.
106-
107-
:param post_params: Normal form parameters.
108-
:param files: File parameters.
109-
:return: Form parameters with files.
110-
"""
111-
params = []
112-
113-
if post_params:
114-
params = post_params
115-
116-
if files:
117-
for k, v in six.iteritems(files):
118-
if not v:
119-
continue
120-
file_names = v if type(v) is list else [v]
121-
for n in file_names:
122-
with open(n, "rb") as f:
123-
filename = os.path.basename(f.name)
124-
filedata = f.read()
125-
mimetype = mimetypes.guess_type(filename)[0] or "application/octet-stream"
126-
params.append(tuple([k, tuple([filename, filedata, mimetype])]))
127-
128-
return params
129-
130103
def select_header_accept(self, accepts):
131104
"""Returns `Accept` based on an array of accepts provided.
132105
@@ -252,10 +225,6 @@ def __call_api(
252225
# specified safe chars, encode everything
253226
resource_path = resource_path.replace("{%s}" % k, quote(str(v), safe=config.safe_chars_for_path_param))
254227

255-
# post parameters
256-
if post_params or files:
257-
post_params = self.prepare_post_parameters(post_params, files)
258-
259228
# auth setting
260229
self.update_params_for_auth(header_params, query_params, auth_settings)
261230

@@ -272,6 +241,7 @@ def __call_api(
272241
query_params=query_params,
273242
headers=header_params,
274243
post_params=post_params,
244+
files=files,
275245
body=body,
276246
_preload_content=_preload_content,
277247
_request_timeout=_request_timeout,
@@ -367,6 +337,7 @@ def request(
367337
query_params=None,
368338
headers=None,
369339
post_params=None,
340+
files=None,
370341
body=None,
371342
_preload_content=True,
372343
_request_timeout=None,
@@ -408,6 +379,7 @@ def request(
408379
query_params=query_params,
409380
headers=headers,
410381
post_params=post_params,
382+
files=files,
411383
_preload_content=_preload_content,
412384
_request_timeout=_request_timeout,
413385
body=body,
@@ -419,6 +391,7 @@ def request(
419391
query_params=query_params,
420392
headers=headers,
421393
post_params=post_params,
394+
files=files,
422395
_preload_content=_preload_content,
423396
_request_timeout=_request_timeout,
424397
body=body,
@@ -430,6 +403,7 @@ def request(
430403
query_params=query_params,
431404
headers=headers,
432405
post_params=post_params,
406+
files=files,
433407
_preload_content=_preload_content,
434408
_request_timeout=_request_timeout,
435409
body=body,
@@ -489,10 +463,6 @@ async def __call_api(
489463
# specified safe chars, encode everything
490464
resource_path = resource_path.replace("{%s}" % k, quote(str(v), safe=config.safe_chars_for_path_param))
491465

492-
# post parameters
493-
if post_params or files:
494-
post_params = self.prepare_post_parameters(post_params, files)
495-
496466
# auth setting
497467
self.update_params_for_auth(header_params, query_params, auth_settings)
498468

@@ -509,6 +479,7 @@ async def __call_api(
509479
query_params=query_params,
510480
headers=header_params,
511481
post_params=post_params,
482+
files=files,
512483
body=body,
513484
_preload_content=_preload_content,
514485
_request_timeout=_request_timeout,
@@ -601,6 +572,7 @@ async def request(
601572
query_params=None,
602573
headers=None,
603574
post_params=None,
575+
files=None,
604576
body=None,
605577
_preload_content=True,
606578
_request_timeout=None,
@@ -642,6 +614,7 @@ async def request(
642614
query_params=query_params,
643615
headers=headers,
644616
post_params=post_params,
617+
files=files,
645618
_preload_content=_preload_content,
646619
_request_timeout=_request_timeout,
647620
body=body,
@@ -653,6 +626,7 @@ async def request(
653626
query_params=query_params,
654627
headers=headers,
655628
post_params=post_params,
629+
files=files,
656630
_preload_content=_preload_content,
657631
_request_timeout=_request_timeout,
658632
body=body,
@@ -664,6 +638,7 @@ async def request(
664638
query_params=query_params,
665639
headers=headers,
666640
post_params=post_params,
641+
files=files,
667642
_preload_content=_preload_content,
668643
_request_timeout=_request_timeout,
669644
body=body,

0 commit comments

Comments
 (0)