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.

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

Jump to bottom

Merge latest developments into UPS branch #109

Merged
merged 111 commits into from
Sep 10, 2024
Merged

Merge latest developments into UPS branch #109

merged 111 commits into from
Sep 10, 2024

Conversation

stuartcampbell
Copy link
Collaborator

No description provided.

stuartcampbell and others added 30 commits May 23, 2024 10:23
@stuartcampbell
Add colour in line with uvicorn logs
9123f35
@stuartcampbell
Add a splash of colour to mongodb startup messages
35dbf2d
@stuartcampbell
Log the PASS and UPS upstream endpoints that we are using
41af018
@Kezzsim
👀 Check output of user directory service
dbfbf3c
@JunAishima
add ability to add detectors to a beamline
bf6fc37
@Kezzsim
▶️ Get the shape of a person from another method ▶️
46a1e47
@stuartcampbell
Remove unneeded methods
6c41d48
@Kezzsim
🧘 If there's a real user present, make them the PI
a3fe2ef
@Kezzsim
🖨️🚫 Remove print statement
c101086
@stuartcampbell
Merge pull request #91 from Kezzsim/fake_props_real_ppl
32ad3ba 
🫂 Add a real person to a proposal so we can test authenticating
@stuartcampbell
Merge branch 'NSLS2:main' into main
fb169b3
@stuartcampbell
Merge branch 'NSLS2:main' into cosmetic-log-changes
65823a7
@stuartcampbell
Remove unneeded methods
1859a50
@stuartcampbell
Fix issues with import httpx wrapper instance
2a8e92c
@stuartcampbell
Merge pull request #95 from stuartcampbell/cosmetic-log-changes
b6ee312 
Fix issue with import httpx wrapper instance
@stuartcampbell
Merge branch 'NSLS2:main' into main
4d09f88
@stuartcampbell
Update example to match model
fd87083
@stuartcampbell
feat: Add AssetDirectory and AssetDirectoryList models
7ca3ee0
@stuartcampbell
Add additional endpoint and deprecate endpoint in effort to rename to…
57d7275 
… a more suitable name.

Also renamed the underlying service method to be more descriptive of what it actually does
@stuartcampbell
Remove the term "Asset" from the name of the models, endpoints and me…
79c736e 
…thods to avoid confusion in the future
@stuartcampbell
Merge pull request #96 from stuartcampbell/add-new-name-for-assets-sk…
efad326 
…eleton

Cleanup endpoint for beamline skeleton
@stuartcampbell
Merge branch 'main' into add-detector-endpoint
651b415
@Kezzsim
🚮 Removing old reference to fake people bool, add new
bae0b8b
@JunAishima
use the more appropriate 409 code for duplicate name
2222062
@JunAishima
fix check to use directory_name
515be2c 
 * the directory name is most important in properly segregating
   data coming from detectors
 * having the same detector name is acceptable so this is not
   used as a check
@Kezzsim
❓️ Make add_specific_user optional
9b30ad4
@Kezzsim
🛂 Pass through add_specific_user string, default to NSLS2 facility
6ccd689
@nmaytan
Merge pull request #90 from JunAishima/add-detector-endpoint
917a62b 
add ability to add detectors to a beamline
@stuartcampbell
Merge pull request #97 from Kezzsim/Fix_fake_proposal_swagger
d65be8e 
🚮 Clean up old variables in the docs
@JunAishima
remove nonsensical setting of detectors
182d8e1 
 * does not make sense at all (possibly something I put in while
   doing initial development)
github-advanced-security[bot]
github-advanced-security bot found potential problems Aug 28, 2024
View reviewed changes
src/nsls2api/infrastructure/security.py Dismissed Show dismissed Hide dismissed
stuartcampbell and others added 22 commits August 28, 2024 14:36
@stuartcampbell
Merge remote-tracking branch 'upstream/main'
f055199
@stuartcampbell
Merge remote-tracking branch 'origin/main'
6104fd4
@stuartcampbell
Update last_updated field for facility when updating dataadmins
39719c8
@stuartcampbell
Add some logging and warnings for no dataadmin group defined.
f33ee58
@padraic-shafer
Merge pull request #110 from stuartcampbell/dataadmin-sync
938727f 
Some improvements to logging output
@nmaytan
Add addl fields to add_detector endpoint
f621df9
@nmaytan
Remove redundant add_service method
e8fa7d3
@nmaytan
Add endpoint to delete detectors/instruments
6a1fce0
@nmaytan
Change delete detector endpoint name
b6eb985
@nmaytan
Switch from DELETE to PUT
f193c79
@nmaytan
Rename inst/det deleting endpoint
8bc7b04
@nmaytan
Remove unneeded args from delete_detector
9b5c1a2
@nmaytan
Enforce inst/det name uniqueness
3ea0c1a
@nmaytan
Refactor add/delete inst/det endpoints into one
7b9a077
@nmaytan
Error message should mention possible dir name conflict
db8b739
@danielballan
Merge pull request #107 from nmaytan/inst_info
cfd608c 
Updates to add_detector endpoint
@nmaytan
Fix f-string in add detector endpoint
5635407
@danielballan
Merge pull request #111 from nmaytan/inst_info
8a11b89 
Fix f-string in add detector endpoint
@nmaytan
Fix variable names for add_detectors
47cd74d
@danielballan
Merge pull request #112 from nmaytan/inst_info
b2f3e5b 
Fix variable names for add_detectors
@nmaytan
Give back softioc-tla write access on proposal top-level
65ac19f
@danielballan
Merge pull request #114 from nmaytan/softioc_writes
b66e201 
Give back softioc-tla write access on proposal top-level
@stuartcampbell stuartcampbell merged commit 7829ce1 into main-ups Sep 10, 2024
204 of 211 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@stuartcampbell @Kezzsim @JunAishima @nmaytan @danielballan @padraic-shafer