Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-webui
Commits
97ebd7f5
Verified
Commit
97ebd7f5
authored
6 months ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Import uses correct name caosadvancedtools
parent
601ab067
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!147
Release 0.15.1
,
!146
Fix zip file export
Pipeline
#57995
passed
6 months ago
Stage: setup
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/server_side_scripting/ext_file_download/zip_files.py
+3
-3
3 additions, 3 deletions
src/server_side_scripting/ext_file_download/zip_files.py
src/server_side_scripting/ext_table_preview/pandas_table_preview.py
+3
-3
3 additions, 3 deletions
..._side_scripting/ext_table_preview/pandas_table_preview.py
with
6 additions
and
6 deletions
src/server_side_scripting/ext_file_download/zip_files.py
+
3
−
3
View file @
97ebd7f5
...
@@ -32,7 +32,7 @@ from zipfile import ZipFile
...
@@ -32,7 +32,7 @@ from zipfile import ZipFile
import
linkahead
as
db
import
linkahead
as
db
import
pandas
as
pd
import
pandas
as
pd
from
linkahead
advancedtools.serverside
import
helper
from
caos
advancedtools.serverside
import
helper
from
linkahead
import
LinkAheadException
,
ConsistencyError
,
EntityDoesNotExistError
from
linkahead
import
LinkAheadException
,
ConsistencyError
,
EntityDoesNotExistError
...
@@ -81,14 +81,14 @@ def collect_files_in_zip(ids, table):
...
@@ -81,14 +81,14 @@ def collect_files_in_zip(ids, table):
# Desired behavior: The script should go on with the other
# Desired behavior: The script should go on with the other
# ids, but the user should be informed about the missing files.
# ids, but the user should be informed about the missing files.
# How should we do this?
# How should we do this?
logger
=
logging
.
getLogger
(
"
linkahead
advancedtools
"
)
logger
=
logging
.
getLogger
(
"
caos
advancedtools
"
)
logger
.
error
(
"
Did not find Entity with ID={}.
"
.
format
(
logger
.
error
(
"
Did not find Entity with ID={}.
"
.
format
(
file_id
))
file_id
))
raise
e
raise
e
savename
=
nc
.
get_unique_savename
(
os
.
path
.
basename
(
tmp
.
path
))
savename
=
nc
.
get_unique_savename
(
os
.
path
.
basename
(
tmp
.
path
))
val_file
=
helper
.
get_file_via_download
(
val_file
=
helper
.
get_file_via_download
(
tmp
,
logger
=
logging
.
getLogger
(
"
linkahead
advancedtools
"
))
tmp
,
logger
=
logging
.
getLogger
(
"
caos
advancedtools
"
))
zf
.
write
(
val_file
,
savename
)
zf
.
write
(
val_file
,
savename
)
...
...
This diff is collapsed.
Click to expand it.
src/server_side_scripting/ext_table_preview/pandas_table_preview.py
+
3
−
3
View file @
97ebd7f5
...
@@ -35,8 +35,8 @@ from datetime import datetime
...
@@ -35,8 +35,8 @@ from datetime import datetime
import
linkahead
as
db
import
linkahead
as
db
import
pandas
as
pd
import
pandas
as
pd
from
linkahead
advancedtools.serverside.helper
import
get_argument_parser
from
caos
advancedtools.serverside.helper
import
get_argument_parser
from
linkahead
advancedtools.serverside.logging
import
configure_server_side_logging
from
caos
advancedtools.serverside.logging
import
configure_server_side_logging
MAXIMUMFILESIZE
=
1e8
MAXIMUMFILESIZE
=
1e8
VALID_ENDINGS
=
[
"
.csv
"
,
"
.tsv
"
,
"
.xls
"
,
"
.xlsx
"
]
VALID_ENDINGS
=
[
"
.csv
"
,
"
.tsv
"
,
"
.xls
"
,
"
.xlsx
"
]
...
@@ -135,7 +135,7 @@ if __name__ == "__main__":
...
@@ -135,7 +135,7 @@ if __name__ == "__main__":
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
debug_file
=
configure_server_side_logging
()
debug_file
=
configure_server_side_logging
()
logger
=
logging
.
getLogger
(
"
linkahead
advancedtools
"
)
logger
=
logging
.
getLogger
(
"
caos
advancedtools
"
)
db
.
configure_connection
(
auth_token
=
args
.
auth_token
)
db
.
configure_connection
(
auth_token
=
args
.
auth_token
)
entity_id
=
args
.
filename
entity_id
=
args
.
filename
...
...
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