Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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-advanced-user-tools
Commits
a370e676
Commit
a370e676
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
DEBUG: print
parent
577632b9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!39
Release 0.4.0
,
!20
created draft for generic analysis method
Pipeline
#17033
passed
3 years ago
Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/caosadvancedtools/serverside/generic_analysis.py
+2
-6
2 additions, 6 deletions
src/caosadvancedtools/serverside/generic_analysis.py
src/caosadvancedtools/serverside/logging.py
+1
-0
1 addition, 0 deletions
src/caosadvancedtools/serverside/logging.py
with
3 additions
and
6 deletions
src/caosadvancedtools/serverside/generic_analysis.py
+
2
−
6
View file @
a370e676
...
...
@@ -25,18 +25,15 @@
"""
Variante I: Python module implementiert eine
'
main
'
function, die einen Record
als Argument entgegen nimmt und diesen um z.B.
'
results
'
ergänzt. Das Update
wird von einer äußeren Funktion übernommen.
als Argument entgegennimmt und diesen um z.B.
'
results
'
ergänzt und updated.
Variante II: Ein skript erhält eine ID als Argument (z.B. auf der command line)
und updated das Objekt selbstständig.
Idealfall: Idempotenz; I.e. es ist egal, ob das Skript schon aufgerufen wurde.
Ein weiterer Aufruf führt ggf. zu einem Update (aber nur bei Änderungen von
z.B. Parametern)
Das aufgerufene Skript kann beliebige Eigenschaften benutzen und erstellen.
ABER wenn die Standardeigenschaften (InputDataSet, etc) verwendet werden, kann
der Record leicht erzeugt werden.
...
...
@@ -88,7 +85,6 @@ import argparse
import
importlib
import
logging
import
os
import
subprocess
import
sys
import
caosdb
as
db
...
...
@@ -140,7 +136,7 @@ def call_script(script_name, record_id):
if
ret
.
code
!=
0
:
logger
.
warning
(
"
Script failed
"
)
logger
.
debug
(
ret
.
stdout
)
logger
.
debug
(
ret
.
stderr
)
logger
.
error
(
ret
.
stderr
)
def
run
(
dataAnalysisRecord
:
db
.
Record
):
...
...
This diff is collapsed.
Click to expand it.
src/caosadvancedtools/serverside/logging.py
+
1
−
0
View file @
a370e676
...
...
@@ -48,6 +48,7 @@ def configure_server_side_logging(loggername="caosadvancedtools"):
# The output shall be printed in the webui. Thus wrap it in html elements.
formatter
=
WebUI_Formatter
(
full_file
=
"
/Shared/{}
"
.
format
(
filename
))
print
(
"
/Shared/{}
"
.
format
(
filename
))
web_handler
=
logging
.
StreamHandler
(
stream
=
sys
.
stdout
)
web_handler
.
setFormatter
(
formatter
)
web_handler
.
setLevel
(
logging
.
INFO
)
...
...
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