Skip to content

Commit

Permalink
Trying stuff...
Browse files Browse the repository at this point in the history
  • Loading branch information
JosePizarro3 committed Jan 13, 2025
1 parent 3306926 commit 8c74a23
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 12 deletions.
12 changes: 12 additions & 0 deletions bam_masterdata/datamodel/collection_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,3 +315,15 @@ class MeasurementsCollection(CollectionType):
show_in_edit_views=False,
section="Comments",
)


from decouple import config as environ

from bam_masterdata.logger import logger
from bam_masterdata.openbis.login import ologin

openbis = ologin(url=environ("OPENBIS_URL"))

Collection().to_openbis(logger=logger, openbis=openbis)
DefaultExperiment().to_openbis(logger=logger, openbis=openbis)
MeasurementsCollection().to_openbis(logger=logger, openbis=openbis)
25 changes: 13 additions & 12 deletions bam_masterdata/metadata/entities.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ def to_openbis(
openbis_entities = getattr(
OpenbisEntities(url=openbis.url), f"get_{type}_dict"
)()
if self.defs.code in openbis_entities.keys():
obis_entity = openbis_entities.get(self.defs.code)
defs = getattr(self, "defs")
if defs.code in openbis_entities.keys():
obis_entity = openbis_entities.get(defs.code)
for key in self.model_fields.keys():
obis_attr = type_map.get(key)
value = obis_entity.get(obis_attr)
Expand All @@ -104,7 +105,7 @@ def to_openbis(
continue

# Check if the value has changed
if value != getattr(self.defs, key):
if value != getattr(defs, key):
# `code` are immutable if they exist already in openBIS
if key == "code":
logger.critical(
Expand All @@ -115,21 +116,21 @@ def to_openbis(
# Otherwise, the attribute can be changed
else:
logger.warning(
f"{self.code} has changed the value for `{key}` from ``{value}`` to ``{getattr(self, key)}``, <<{datetime.now()}>>\n"
f"{defs.code} has changed the value for `{key}` from ``{value}`` to ``{getattr(self, key)}``, <<{datetime.now()}>>\n"
"We will update its value in openBIS."
)
prop = openbis.get_property_type(self.defs.code)
prop = openbis.get_property_type(defs.code) # !!!
print(prop) # TODO delete this and uncomment next line
# setattr(prop, obis_attr, getattr(self, key))
else:
# Adding it to openBIS
prop = openbis.new_property_type(
code=self.code,
description=self.description,
label=self.property_label,
dataType=self.data_type,
vocabulary=self.vocabulary_code,
metaData=self.metadata,
prop = openbis.new_property_type( # !!!
code=defs.code,
description=defs.description,
label=defs.property_label,
dataType=defs.data_type,
vocabulary=defs.vocabulary_code,
metaData=defs.metadata,
)
print(prop) # TODO delete this and uncomment next line
# prop.save()
Expand Down

1 comment on commit 8c74a23

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
bam_masterdata
   logger.py80100% 
bam_masterdata/cli
   cli.py704545 36%
   entities_to_excel.py5433 94%
   entities_to_json.py3655 86%
   fill_masterdata.py180167167 7%
bam_masterdata/datamodel
   collection_types.py4433 93%
   dataset_types.py184184184 0%
   object_types.py15150100% 
   property_types.py8000100% 
   vocabulary_types.py137210100% 
bam_masterdata/metadata
   _maps.py50100% 
   definitions.py1032222 79%
   entities.py872828 68%
bam_masterdata/openbis
   get_entities.py534343 19%
   login.py633 50%
bam_masterdata/utils
   utils.py3866 84%
TOTAL1690450997% 

Tests Skipped Failures Errors Time
58 1 💤 2 ❌ 0 🔥 16.176s ⏱️

Please sign in to comment.