Skip to content

✨ Start implementation of programs section of api server #7447

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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4fb6ff7
allow to use dynamic services in catalog client
bisgaard-itis Mar 24, 2025
6cdec6e
further refactoring
bisgaard-itis Mar 24, 2025
30358cb
naming fix
bisgaard-itis Mar 24, 2025
cf7b4c3
make list_services private
bisgaard-itis Mar 25, 2025
9c54aae
test listing programs works
bisgaard-itis Mar 25, 2025
74c58d8
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Mar 26, 2025
2f5d0b3
add get program release to programs api
bisgaard-itis Mar 26, 2025
625efc6
first attempt at creating visible studies via api server
bisgaard-itis Mar 26, 2025
8fdc1e9
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Mar 27, 2025
4d59a64
refactoring
bisgaard-itis Mar 27, 2025
3ca72d7
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Mar 28, 2025
97cd806
first effort to allow to upload directly into program job
bisgaard-itis Mar 28, 2025
37e246f
make api-server run again
bisgaard-itis Mar 28, 2025
96b5af7
fix several tests
bisgaard-itis Mar 31, 2025
c26c985
fix fileid check
bisgaard-itis Mar 31, 2025
17b38a9
ensure uploading of file works
bisgaard-itis Mar 31, 2025
b36b12d
add creation of workspace directory when creating program job
bisgaard-itis Mar 31, 2025
1f91818
refactor generation of domain file
bisgaard-itis Mar 31, 2025
60a1662
minor cleanup
bisgaard-itis Mar 31, 2025
e46a4af
client_file -> user_file
bisgaard-itis Mar 31, 2025
4055f44
refactor completion fcn into two
bisgaard-itis Apr 1, 2025
0e386d0
correctly exctract filename and fileid
bisgaard-itis Apr 1, 2025
583d864
slight renaming
bisgaard-itis Apr 1, 2025
c16e911
make unit tests pass
bisgaard-itis Apr 1, 2025
c175a0b
make pylint happy
bisgaard-itis Apr 1, 2025
0d47ba2
merge master into 1870-start-program-section-of-api-server
bisgaard-itis Apr 1, 2025
2007b98
fix types
bisgaard-itis Apr 1, 2025
1eb93ef
make pylint happy
bisgaard-itis Apr 1, 2025
02312b3
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Apr 1, 2025
7e5a251
make pylint happy
bisgaard-itis Apr 1, 2025
27082c9
use correct fileid
bisgaard-itis Apr 1, 2025
f3b3704
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Apr 1, 2025
22948bd
fix return type
bisgaard-itis Apr 7, 2025
885f6fa
fix relative import
bisgaard-itis Apr 7, 2025
da82b5f
cleanup @sanderegg @pcrespov
bisgaard-itis Apr 7, 2025
a9a3ae2
fix relative import @sanderegg
bisgaard-itis Apr 7, 2025
06775b1
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Apr 7, 2025
1329c06
try to make openapi specs check happy
bisgaard-itis Apr 7, 2025
7c6fc74
revert
bisgaard-itis Apr 7, 2025
c75238f
bugfix
bisgaard-itis Apr 8, 2025
0018ce7
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Apr 8, 2025
3f03c39
@pcrespov use Annotated in Programs
bisgaard-itis Apr 8, 2025
bf7c51c
fix test name
bisgaard-itis Apr 8, 2025
53581e1
refactor common code in programs and solvers
bisgaard-itis Apr 8, 2025
870bc39
fix tests
bisgaard-itis Apr 8, 2025
adce963
introduce _base.py and refactor
bisgaard-itis Apr 8, 2025
074882f
use Annotated @pcrespov
bisgaard-itis Apr 8, 2025
0d24d83
correctly type hint @pcrespov
bisgaard-itis Apr 8, 2025
eef305f
update specs
bisgaard-itis Apr 8, 2025
6797140
fix
bisgaard-itis Apr 8, 2025
bbad54d
fix
bisgaard-itis Apr 8, 2025
a5f08c4
fix incorrect import
bisgaard-itis Apr 8, 2025
488092b
make typecheck happy
bisgaard-itis Apr 8, 2025
f866265
Merge branch 'master' into 1870-start-program-section-of-api-server
bisgaard-itis Apr 8, 2025
562324f
@sanderegg consolidate complete upload methdos
bisgaard-itis Apr 8, 2025
07f6285
always return
bisgaard-itis Apr 8, 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
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,18 @@ async def complete_file_upload(
uploaded_parts: list[UploadedPart],
upload_completion_link: AnyUrl,
client_session: ClientSession | None = None,
) -> ETag:
is_directory: bool = False,
) -> ETag | None:
async with ClientSessionContextManager(client_session) as session:
e_tag: ETag | None = await _filemanager_utils.complete_upload(
session=session,
upload_completion_link=upload_completion_link,
parts=uploaded_parts,
is_directory=False,
is_directory=is_directory,
)
# should not be None because a file is being uploaded
assert e_tag is not None # nosec
if not is_directory:
assert e_tag is not None # nosec
return e_tag


Expand Down Expand Up @@ -278,8 +280,7 @@ class UploadedFile:


@dataclass
class UploadedFolder:
...
class UploadedFolder: ...


async def _generate_checksum(
Expand Down
Loading
Loading