Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
06facc37
Commit
06facc37
authored
4 years ago
by
Rivers, Travis (Contractor) Creighton
Committed by
Jeremy M Fee
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
add to json method for Metadata class
parent
af662091
No related branches found
No related tags found
2 merge requests
!146
Release CMO metadata to production
,
!46
Webservice query
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geomagio/api/secure/metadata.py
+3
-2
3 additions, 2 deletions
geomagio/api/secure/metadata.py
geomagio/metadata/Metadata.py
+4
-0
4 additions, 0 deletions
geomagio/metadata/Metadata.py
with
7 additions
and
2 deletions
geomagio/api/secure/metadata.py
+
3
−
2
View file @
06facc37
...
@@ -35,8 +35,9 @@ async def create_metadata(
...
@@ -35,8 +35,9 @@ async def create_metadata(
metadata
:
Metadata
,
metadata
:
Metadata
,
user
:
User
=
Depends
(
require_user
()),
user
:
User
=
Depends
(
require_user
()),
):
):
metadata
=
await
metadata_table
.
create_metadata
(
metadata
)
created_metadata
=
await
metadata_table
.
create_metadata
(
metadata
)
return
Response
(
metadata
,
status_code
=
201
,
media_type
=
"
application/json
"
)
print
(
metadata
.
to_json
())
return
Response
(
metadata
.
to_json
(),
status_code
=
201
,
media_type
=
"
application/json
"
)
@router.delete
(
"
/metadata/{id}
"
)
@router.delete
(
"
/metadata/{id}
"
)
...
...
This diff is collapsed.
Click to expand it.
geomagio/metadata/Metadata.py
+
4
−
0
View file @
06facc37
from
datetime
import
timezone
from
datetime
import
timezone
import
json
from
typing
import
Dict
from
typing
import
Dict
from
obspy
import
UTCDateTime
from
obspy
import
UTCDateTime
...
@@ -87,3 +88,6 @@ class Metadata(BaseModel):
...
@@ -87,3 +88,6 @@ class Metadata(BaseModel):
@validator
(
"
created_time
"
)
@validator
(
"
created_time
"
)
def
set_default_created_time
(
cls
,
created_time
:
UTCDateTime
=
None
)
->
UTCDateTime
:
def
set_default_created_time
(
cls
,
created_time
:
UTCDateTime
=
None
)
->
UTCDateTime
:
return
created_time
or
UTCDateTime
()
return
created_time
or
UTCDateTime
()
def
to_json
(
self
):
return
json
.
dumps
(
self
,
default
=
lambda
o
:
o
.
__dict__
,
sort_keys
=
True
,
indent
=
4
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment