Skip to content
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

Multi-Feature Merge. Please Review Carefully. #699

Merged
merged 137 commits into from
Oct 31, 2023
Merged
Changes from 1 commit
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
25e848f
refactor sharing view (broken)
jchate6 May 16, 2023
035dea3
add hermes error message
jchate6 May 16, 2023
c96829a
Merge branch 'dev' into feature/tom2tom_data_sharing
jchate6 May 16, 2023
4da20e8
fix some imports
jchate6 May 16, 2023
e801e81
finish Dataproduct sharing
jchate6 May 18, 2023
008ac57
add reduced datum sharing
jchate6 Jun 22, 2023
b758531
fix some lint issues
jchate6 Jun 22, 2023
89b0876
add tests for no connection to target tom
jchate6 Jun 27, 2023
06d2f70
fix tests to spoof settings
jchate6 Jun 27, 2023
f4deef8
add username/password to settings override
jchate6 Jun 27, 2023
71ef6ac
make properly formatted fake url
jchate6 Jun 27, 2023
17a7a03
add tests for succesful sharing
jchate6 Jun 28, 2023
2f69477
Merge branch 'dev' into feature/tom2tom_data_sharing
jchate6 Jun 28, 2023
7208fd2
Merge branch 'feature/tom2tom_data_sharing' into feature/tom-tom-targ…
jchate6 Jul 5, 2023
e6e7e95
set up ui buttons for sharing
jchate6 Jul 6, 2023
d342af2
Build Target sharing form page
jchate6 Jul 13, 2023
1977bf8
share target.
jchate6 Jul 19, 2023
2d5eb96
move data_sharing to view.
jchate6 Jul 20, 2023
ccb0588
actually include target sharing .py
jchate6 Jul 20, 2023
98a1ad2
fix tests
jchate6 Jul 20, 2023
bab12fd
fix up some tests
jchate6 Jul 20, 2023
5d70c07
address lint
jchate6 Jul 20, 2023
c94dfb7
add newline
jchate6 Jul 20, 2023
75b649e
fix submit button bug for target sharing
jchate6 Aug 8, 2023
53dad4f
create barebones group share page/view
jchate6 Aug 9, 2023
74f5fb3
add functioning target check boxes
jchate6 Aug 15, 2023
0e08362
initiate form
jchate6 Aug 15, 2023
316d6f5
establish target sharing with groups
jchate6 Aug 15, 2023
917b0d3
add tests for group sharing
jchate6 Aug 16, 2023
38cbac0
refactor target_list from group and add API
jchate6 Aug 30, 2023
c5eb0f9
lint fixes
jchate6 Aug 30, 2023
850a181
add empty feedback handler
jchate6 Sep 5, 2023
d94a86c
add better error handling
jchate6 Sep 12, 2023
9e6f27c
fix undefined reference.
jchate6 Sep 12, 2023
6807f66
fix tests to include updates to targetlists
jchate6 Sep 13, 2023
98c0498
get_facility_context_data needs the target to resolve it via Swifts r…
phycodurus Oct 5, 2023
8f6cf5d
Add forced photometry service architecture and atlas implementation
Oct 5, 2023
9a1fde4
fix some flake8 issues
Oct 6, 2023
77427bf
Added documentation for forced photometry services
Oct 6, 2023
199cecc
Remove typing since thats breaking tests
Oct 6, 2023
319f315
add fuzzy, multi-target filters
jchate6 Oct 11, 2023
1eec81a
Merge branch 'dev' into feature/tom2tom_data_sharing
jchate6 Oct 11, 2023
c692820
Merge branch 'feature/tom2tom_data_sharing' into feature/tom-tom-targ…
jchate6 Oct 11, 2023
19cf5ca
add comments
jchate6 Oct 12, 2023
9750f2a
hide sharing options when unconfigured.
jchate6 Oct 13, 2023
d1b2b03
Add newline at end of template
Oct 16, 2023
9d87392
update readthedocs
jchate6 Oct 16, 2023
d2de0cd
Merge pull request #696 from TOMToolkit/feature/add_forced_photometry
jchate6 Oct 16, 2023
07c41f5
Merge pull request #676 from TOMToolkit/feature/tom-tom-target-sharing
jchate6 Oct 16, 2023
fe9b649
Merge branch 'dev' into feature/tom2tom_data_sharing
jchate6 Oct 16, 2023
af9284e
some lint issues
jchate6 Oct 16, 2023
7ee5576
Merge pull request #659 from TOMToolkit/feature/tom2tom_data_sharing
jchate6 Oct 17, 2023
26874a3
Merge branch 'dev' into feature/swift-facility
jchate6 Oct 17, 2023
864a114
Merge pull request #698 from TOMToolkit/feature/swift-facility
jchate6 Oct 17, 2023
95aee14
nfc: I just re-ordered the imports
phycodurus Oct 19, 2023
1ac3a4d
provides reasonable-ish initial values for the ATLAS query timebox
phycodurus Oct 19, 2023
2f7851c
I was getting a stacktrace b/c add_error wants two params
phycodurus Oct 19, 2023
f188e9b
reminder that dramatiq workers must be running for asynch operation
phycodurus Oct 19, 2023
de641a4
this is more consistent with TOM Toolkit naming conventions
phycodurus Oct 20, 2023
29d05a6
make all those print statements logger.debug statements
phycodurus Oct 20, 2023
a11d146
we crash with empyt config dictionaries, so leave them out
phycodurus Oct 20, 2023
a85d459
missed a few 'atlas' to 'ATLAS' changes
phycodurus Oct 20, 2023
b45de04
flake8 compliance
phycodurus Oct 20, 2023
2cdfde0
handle other responses than 500
jchate6 Oct 23, 2023
e5c3f9c
allow for blank fields in the ReducedDatum Model
jchate6 Oct 23, 2023
4cb3e50
Merge pull request #702 from TOMToolkit/feature/atlas_tweaks
phycodurus Oct 23, 2023
355830f
change publish to share for consistency
jchate6 Oct 23, 2023
8f7221e
revert accidental settings.py changes
jchate6 Oct 23, 2023
f068566
Merge branch 'dev' into fix/tom_sharing_tweaks
jchate6 Oct 23, 2023
727ef98
Merge pull request #710 from TOMToolkit/fix/tom_sharing_tweaks
jchate6 Oct 23, 2023
bea19cf
fix critical codacy test
jchate6 Oct 25, 2023
f8bebee
fixed codacy redefined built-in issues
LTDakin Oct 25, 2023
2da98cc
fixed linting errors
LTDakin Oct 25, 2023
040e513
test constructor call fix
jchate6 Oct 25, 2023
981b796
removed trailing whitespace
LTDakin Oct 25, 2023
64b1411
rest of constructor call fix
jchate6 Oct 25, 2023
8fb78d3
Removed codacy Unnecessary pass statements
LTDakin Oct 25, 2023
f4dcddf
remove minor style errors
jchate6 Oct 25, 2023
567093e
removed unnecessary pass statements
LTDakin Oct 25, 2023
3668f9d
fixed codacy string blocks
LTDakin Oct 25, 2023
b20a561
test fix for variadics style
jchate6 Oct 25, 2023
888316c
changed unused strings to comments
LTDakin Oct 25, 2023
60bef8a
codacy signature differs fix for arg type
LTDakin Oct 25, 2023
f0e89e1
signature differs and builtin codacy changes
LTDakin Oct 25, 2023
459dbe4
more codacy fixes
jchate6 Oct 25, 2023
c5e2f4a
fixed missing id name change
LTDakin Oct 25, 2023
1a34922
fixed line length inting error
LTDakin Oct 25, 2023
1e844d5
final get_form fix
jchate6 Oct 25, 2023
4542b22
Merge branch 'fix/codacy-lloyd' into fix/codacy-Joey
jchate6 Oct 25, 2023
370f45c
try to match signatures
jchate6 Oct 25, 2023
f84cb6c
add poetry for dependency management
phycodurus Oct 26, 2023
9529920
update pypi-release.yml workflow: poetry and PyPI trusted publishing
phycodurus Oct 26, 2023
71d1629
display TOM Toolkit version and link to repo on index page footer
phycodurus Oct 26, 2023
9900ab9
update pyproject.toml
phycodurus Oct 26, 2023
58cfc95
fix syntax errors (these must be lists of strings)
phycodurus Oct 26, 2023
c2f4dad
update to install deps and build from pyproject.toml
phycodurus Oct 26, 2023
aaecb33
add documentatino link
phycodurus Oct 26, 2023
0a22c0b
add test and docs dependencies
phycodurus Oct 26, 2023
2fb535f
fix up syntax for doc dependencies
phycodurus Oct 26, 2023
747002c
install deps using peotry install command
phycodurus Oct 26, 2023
dbe89d4
temporarly remove python 3.12 from testing matrix
phycodurus Oct 27, 2023
e02b584
trying to find a numpy
phycodurus Oct 27, 2023
5be74f8
update dependencies in poetry.lock file
phycodurus Oct 27, 2023
62cdeef
change lint python version from most recent to 3.10
jchate6 Oct 27, 2023
18b9179
fix syntax to use python 3.10 instead of 3.1 :D
jchate6 Oct 27, 2023
f90808e
test including librdkafka-dev
jchate6 Oct 27, 2023
668fde3
remove librdkafka install
jchate6 Oct 27, 2023
286f8e0
new version matrix for dependency probs w/ numpy and antares-client
phycodurus Oct 28, 2023
59768f3
add diagnostics
phycodurus Oct 28, 2023
622cdd2
use pip not poetry install to install dependencies
phycodurus Oct 28, 2023
6d61d67
initiate template form with LCO facility.
jchate6 Oct 30, 2023
f52b331
missing whitespace
jchate6 Oct 30, 2023
01bcbac
narrow down python version to what works with these deps
phycodurus Oct 30, 2023
4ec2af5
remove tom_antares from deps
phycodurus Oct 31, 2023
fd98334
debug issue where django itself doesn't seem to be installed
phycodurus Oct 31, 2023
8b81955
run test using the venv that poetry created (and populated w/deps)
phycodurus Oct 31, 2023
192dc22
add poetry groups for code coverage and linting
phycodurus Oct 31, 2023
323bb4f
convert lint and publish_coverage jobs to the poetry way of things
phycodurus Oct 31, 2023
15662eb
update coverage,coveralls constraints and write new poetry.lock
phycodurus Oct 31, 2023
e0f6672
use poetry dependency groups to install coveralls and flake8
phycodurus Oct 31, 2023
438f2d0
update for poetry-based workflow
phycodurus Oct 31, 2023
41fdedd
Merge pull request #726 from TOMToolkit/fix/ocs_facility_observation_…
jchate6 Oct 31, 2023
0780291
Merge branch 'dev' into fix/codacy-Joey
jchate6 Oct 31, 2023
2056711
Merge pull request #717 from TOMToolkit/fix/codacy-Joey
jchate6 Oct 31, 2023
a897637
add the newly required build section to readthedocs config file
phycodurus Oct 31, 2023
5778d29
Merge pull request #729 from TOMToolkit/feature/readthedocs-config
phycodurus Oct 31, 2023
e21f980
Merge branch 'dev' into feature/install-poetry
jchate6 Oct 31, 2023
b5e9516
version is no longer a python config option
phycodurus Oct 31, 2023
61db62e
Merge branch 'dev' into feature/install-poetry
phycodurus Oct 31, 2023
ef802be
Merge pull request #718 from TOMToolkit/feature/install-poetry
phycodurus Oct 31, 2023
a6e6b2e
configure readthedocs to use poetry to install dependencies
phycodurus Oct 31, 2023
6645213
update author list and copyright info
phycodurus Oct 31, 2023
57a2bcb
add to poetry deps (this is failing in the rtd doc builds)
phycodurus Oct 31, 2023
e0938a7
fix typo: call super's __init__(),
phycodurus Oct 31, 2023
d24ffbb
remove unused variable
jchate6 Oct 31, 2023
5f38785
more unused variables
jchate6 Oct 31, 2023
75d9526
fix indents
jchate6 Oct 31, 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
Prev Previous commit
Next Next commit
I was getting a stacktrace b/c add_error wants two params
The first, the field that the error pertains to, can be None.
phycodurus committed Oct 19, 2023
commit 2f7851cfc282947a294be18c5d61af9cbb5d7426
2 changes: 1 addition & 1 deletion tom_dataproducts/views.py
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@ def post(self, request, *args, **kwargs):
try:
service.query_service(form.cleaned_data)
except fps.ForcedPhotometryServiceException as e:
form.add_error(f"Problem querying forced photometry service: {repr(e)}")
form.add_error(None, f"Problem querying forced photometry service: {repr(e)}")
return self.form_invalid(form)
messages.info(self.request, service.get_success_message())
return redirect(