Skip to content

allow for passing directly the python dict string as response body #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliohm merged 18 commits into from
Jan 16, 2025
Merged

allow for passing directly the python dict string as response body #59

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b23000a
allow for passing directly the python dict string as response body
ghyatzo Jan 15, 2025
25e438a
fix: renaming and type widening
ghyatzo Jan 15, 2025
8c405da
feat: updated README with new examples of usage and added a depwarnin…
ghyatzo Jan 15, 2025
1179149
fix: wrong signature for depwarn
ghyatzo Jan 15, 2025
5aa8218
Improve docstring
juliohm Jan 16, 2025
008458b
remove short description of the code snippet.
ghyatzo Jan 16, 2025
99f7e06
Merge branch 'master' into direct-json
ghyatzo Jan 16, 2025
1d78857
Update README.md
juliohm Jan 16, 2025
8ce9d56
Minor adjustments
juliohm Jan 16, 2025
493afa7
Refactor tests
juliohm Jan 16, 2025
c1ac9e0
add small comment suggesting manipulation of dict if needed.
ghyatzo Jan 16, 2025
644c110
Deprecate py2ju
juliohm Jan 16, 2025
cd72432
Merge branch 'direct-json' of https://github.com/ghyatzo/cdsapi.jl in…
juliohm Jan 16, 2025
20adf69
fix missing endpoint variable
ghyatzo Jan 16, 2025
297c4b8
Minor doc adjustments
juliohm Jan 16, 2025
9e09ba2
Adjust tests
juliohm Jan 16, 2025
ab44171
fix test request strings
ghyatzo Jan 16, 2025
a57e82a
Minor adjustments in runtests.jl
juliohm Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/CDSAPI.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ directory as `filename`.
The client periodically requests the status of the retrieve request.
`wait` is the maximum time (in seconds) between status updates.
"""
function retrieve(name, params, filename; wait=1.0)
function retrieve(name, params, filename; wait=1.0) end

function retrieve(name, params::AbstractDict, filename; wait=1.0)
creds = Dict()
open(joinpath(homedir(), ".cdsapirc")) do f
for line in readlines(f)
Expand All @@ -27,12 +29,12 @@ function retrieve(name, params, filename; wait=1.0)
["PRIVATE-TOKEN" => creds["key"]],
body=JSON.json(Dict("inputs" => params))
)
body = JSON.parse(String(response.body))
data = Dict("status" => "queued")

data = JSON.parse(String(response.body))
job_endpoint = Dict(response.headers)["location"]

while data["status"] != "successful"
data = HTTP.request("GET",
creds["url"] * "/retrieve/v1/jobs/" * string(body["jobID"]),
data = HTTP.request("GET", job_endpoint,
["PRIVATE-TOKEN" => creds["key"]]
)
data = JSON.parse(String(data.body))
Expand All @@ -53,7 +55,7 @@ function retrieve(name, params, filename; wait=1.0)
end

response = HTTP.request("GET",
creds["url"] * "/retrieve/v1/jobs/" * string(body["jobID"]) * "/results",
job_endpoint * "/results",
["PRIVATE-TOKEN" => creds["key"]]
)
body = JSON.parse(String(response.body))
Expand All @@ -62,6 +64,9 @@ function retrieve(name, params, filename; wait=1.0)
return data
end

retrieve(name, params::String, filename; wait=1.0) =
retrieve(name, JSON.parse(params), filename; wait)

"""
py2ju(dictstr)

Expand Down