Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Wellbore Domain Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
Domain Data Management Services
Wellbore
Wellbore Domain Services
Commits
6d56975d
Commit
6d56975d
authored
3 years ago
by
Luc Yriarte
Browse files
Options
Downloads
Patches
Plain Diff
Fix imports and unit test after moving bulk_v3
parent
f3bf3226
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!202
exclusiveMinimum and maximum does not make sense with ValueWithUnit object, it...
,
!201
exclusiveMinimum and maximum does not make sense with ValueWithUnit object, it...
,
!136
Bulk api v2
Pipeline
#47122
passed with warnings
3 years ago
Stage: build
Stage: containerize
Stage: scan
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/wdms_app.py
+3
-3
3 additions, 3 deletions
app/wdms_app.py
tests/unit/bulk_persistence/dataframe_render_test.py
+1
-1
1 addition, 1 deletion
tests/unit/bulk_persistence/dataframe_render_test.py
with
4 additions
and
4 deletions
app/wdms_app.py
+
3
−
3
View file @
6d56975d
...
...
@@ -17,6 +17,7 @@ from fastapi import FastAPI, Depends
from
fastapi.openapi.utils
import
get_openapi
from
app
import
__version__
,
__build_number__
,
__app_name__
from
app
import
bulk_utils
from
app.auth.auth
import
require_opendes_authorized_user
from
app.conf
import
Config
,
check_environment
from
app.errors.exception_handlers
import
add_exception_handlers
...
...
@@ -46,7 +47,6 @@ from app.routers.trajectory import trajectory_ddms_v2
from
app.routers.dipset
import
dipset_ddms_v2
,
dip_ddms_v2
from
app.routers.logrecognition
import
log_recognition
from
app.routers.search
import
search
,
fast_search
from
app.routers.ddms_v3
import
bulk_v3
from
app.clients
import
StorageRecordServiceClient
,
SearchServiceClient
from
app.utils
import
get_http_client_session
,
OpenApiHandler
,
get_wdms_temp_dir
...
...
@@ -189,7 +189,7 @@ wdms_app.include_router(
prefix
=
ALPHA_APIS_PREFIX
+
DDMS_V3_PATH
+
welllog_ddms_v3
.
WELL_LOGS_API_BASE_PATH
,
tags
=
tags
,
dependencies
=
dependencies
)
wdms_app
.
include_router
(
bulk_
v3
.
router_bulk
,
bulk_
utils
.
router_bulk
,
prefix
=
ALPHA_APIS_PREFIX
+
DDMS_V3_PATH
+
welllog_ddms_v3
.
WELL_LOGS_API_BASE_PATH
,
tags
=
tags
,
dependencies
=
dependencies
)
...
...
@@ -199,7 +199,7 @@ wdms_app.include_router(
prefix
=
ALPHA_APIS_PREFIX
+
DDMS_V3_PATH
+
wellbore_trajectory_ddms_v3
.
WELLBORE_TRAJECTORIES_API_BASE_PATH
,
tags
=
tags
,
dependencies
=
dependencies
)
wdms_app
.
include_router
(
bulk_
v3
.
router_bulk
,
bulk_
utils
.
router_bulk
,
prefix
=
ALPHA_APIS_PREFIX
+
DDMS_V3_PATH
+
wellbore_trajectory_ddms_v3
.
WELLBORE_TRAJECTORIES_API_BASE_PATH
,
tags
=
tags
,
dependencies
=
dependencies
)
...
...
This diff is collapsed.
Click to expand it.
tests/unit/bulk_persistence/dataframe_render_test.py
+
1
−
1
View file @
6d56975d
...
...
@@ -4,7 +4,7 @@ from io import BytesIO
from
fastapi
import
HTTPException
from
app.model.model_chunking
import
GetDataParams
from
app.
routers.ddms_v3.bulk_v3
import
DataFrameRender
,
get_df_from_request
from
app.
bulk_utils
import
DataFrameRender
,
get_df_from_request
import
pandas
as
pd
from
pandas.testing
import
assert_frame_equal
...
...
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