Skip to content

59 change context type for v2 #60

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.

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
merged 65 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
8838bb1
adding new methods for making pyclowder compatible with clowder v2
tcnichol Aug 11, 2022
be720b0
works up until upload metadata
tcnichol Aug 12, 2022
f30c23a
seems to get rather than post metadata
tcnichol Aug 12, 2022
dd5c4ef
metadata does post
tcnichol Aug 15, 2022
3ab801e
removing debug line
tcnichol Aug 15, 2022
ff13256
extractor info sent to clowder2.0 now fits the ExtractorIn parameters
tcnichol Aug 15, 2022
f98a5dc
adding new class for api files, metadata
tcnichol Aug 17, 2022
97470eb
calling v2 files if that is the version
tcnichol Aug 17, 2022
fe490f6
back to unprocessable entry problem
tcnichol Aug 17, 2022
d31e78a
partially fixed problem of metadata need better solution (also need t…
tcnichol Aug 17, 2022
fb8b0b5
calling methods in api v2 for files and datasets
tcnichol Aug 18, 2022
518a18d
fix typo
tcnichol Aug 24, 2022
dccc321
using token instead of key
tcnichol Oct 5, 2022
2852221
making sure to use token instead of key
tcnichol Oct 6, 2022
50e4a16
moving methods to api.v1.datasets
tcnichol Oct 12, 2022
cfb5f4a
file methods in api.v2 and api.v1
tcnichol Oct 12, 2022
a32a78d
python-dotenv and not just dotenv
tcnichol Oct 12, 2022
94d5648
adding imports
tcnichol Oct 12, 2022
4d34b4f
removing token from v1 datasets
tcnichol Oct 12, 2022
06aeed0
using datasets v1
tcnichol Oct 12, 2022
fa4dd8b
fixing token not passed in
tcnichol Oct 12, 2022
8243fef
'key' used for both v1 and v2
tcnichol Nov 11, 2022
03d7527
for v2, 'token' is replaced with secretKey in v2, so only the api end…
tcnichol Nov 11, 2022
0fc78dd
500 error in clowder2 for posting metadata.
tcnichol Nov 11, 2022
78ef5a4
fixing datasets - token no longer used metadata does post
tcnichol Nov 12, 2022
201b29d
default clowder version 1.0
tcnichol Dec 8, 2022
edcee1b
removing token from datasets, always calling it key
tcnichol Dec 8, 2022
986da98
removing token using key
tcnichol Dec 8, 2022
76e7104
removing unimplemented methods
tcnichol Dec 8, 2022
df55e40
removing unimplemented methods
tcnichol Dec 8, 2022
6ca6a82
add two more default versions
max-zilla Dec 12, 2022
adf287a
Merge branch '50-clowder20-submit-file-to-extractor' of https://githu…
max-zilla Dec 12, 2022
4e86e33
allow dynamic preparation of v1/v2 files for extraction
max-zilla Dec 12, 2022
4d6d814
version checks revert to single check location
max-zilla Dec 12, 2022
2179522
remove extractors routing key
max-zilla Dec 16, 2022
031d876
clean up environment variable
max-zilla Dec 16, 2022
f581ff5
remove dotenv dependency
max-zilla Dec 16, 2022
a836d74
deleting
tcnichol Dec 16, 2022
b196e0d
Merge remote-tracking branch 'origin/50-clowder20-submit-file-to-extr…
tcnichol Dec 16, 2022
94592b3
remove extractor registration code
max-zilla Dec 16, 2022
4c27a99
Merge branch '50-clowder20-submit-file-to-extractor' of https://githu…
max-zilla Dec 16, 2022
9ed301c
Update to v3, refactor ClowderClient, example implementation in datasets
max-zilla Dec 16, 2022
abd54d5
use clowder client instead of host,key
tcnichol Dec 16, 2022
29d3e22
need / for api calls
tcnichol Dec 17, 2022
f3c81cb
reverting clowder version to 1 as default
tcnichol Dec 19, 2022
4147390
cleanup a few client parameters
max-zilla Dec 20, 2022
6780c28
Added __init__.py to v2 directories.
lmarini Jan 18, 2023
bbcf1b9
support clowder2 job_id field
max-zilla Jan 25, 2023
916ec25
making 'contents' 'content' to match v2 metadata
tcnichol Jan 25, 2023
2d4a1e3
both content and contents
tcnichol Jan 26, 2023
70861e2
clowder version passed in as argument
tcnichol Jan 26, 2023
7d556a0
use environment variable
tcnichol Jan 26, 2023
22c9d6e
new method for getting download url
tcnichol Jan 27, 2023
acfd080
handling cases with contexts for v1 and v2
tcnichol Jan 27, 2023
f36a707
fixing a bug in line
tcnichol Jan 30, 2023
42a0974
fixing, pass in client
tcnichol Jan 30, 2023
f508bf5
in v2 files have 'name' not 'filename'
tcnichol Jan 30, 2023
c856883
'name' not 'filename' in v2
tcnichol Jan 30, 2023
b0a94e2
using host and key as arguments to match v1
tcnichol Jan 30, 2023
392fa2a
changing python versions for github actions
tcnichol Feb 3, 2023
c7d1926
fixing typo (client)
tcnichol Feb 3, 2023
f668d7e
client.host and client.key, not host and key
tcnichol Feb 3, 2023
e39ca97
changing context type for v2
tcnichol Feb 15, 2023
e6fdf00
Merge remote-tracking branch 'origin/master' into 59-change-context-t…
tcnichol Feb 21, 2023
a62ce2e
Merge branch 'master' into 59-change-context-type-for-v2
tcnichol Feb 21, 2023
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## 3.0.0 - 2022-12-16
This version adds Clowder 2 support and removes the old method of extractor registration in favor of reliance on heartbeats.

### Added
- api/v1 and api/v2 code split for back compatibility as v2 is introduced.
- new simplified ClowderClient is used in the new split endpoints for future refactoring.

### Removed
- remove RABBITMQ_EXCHANGE parameter and REGISTRATION_URL parameter.
- remove DatasetsAPI and object-oriented ClowderClient.

## 2.7.0 - 2023-02-14

When extractors download a file from clowder it will ask clowder to not track that download.
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ ARG PYTHON_VERSION="2.7"
# environment variables
ENV PYTHON_VERSION=${PYTHON_VERSION} \
RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
RABBITMQ_EXCHANGE="clowder" \
RABBITMQ_QUEUE="" \
CLOWDER_URL="" \
REGISTRATION_ENDPOINTS="" \
EMAIL_SERVER="" \
EMAIL_SENDER="extractor" \
MAIN_SCRIPT=""
Expand Down
Empty file added pyclowder/api/__init__.py
Empty file.
Empty file added pyclowder/api/v1/__init__.py
Empty file.
Loading