jebus/enviPy-bayer
1
0
Fork 0
forked from enviPath/enviPy
Code Issues Pull Requests 1 Actions Releases Activity

Fix Classification import, Fix PES Deserialization

Browse Source
This commit is contained in:
Tim Lorsbach
2026-07-08 20:20:36 +02:00
parent d06ed33196
commit 3bb9220b22
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
utilities/misc.py
View File

@ -36,7 +36,7 @@ from epdb.models import (
Setting, Setting,
SimpleAmbitRule, SimpleAmbitRule,
SimpleRDKitRule, SimpleRDKitRule,
SimpleRule, SimpleRule, Group,
) )
from utilities.chem import FormatConverter from utilities.chem import FormatConverter
@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)
Package = s.GET_PACKAGE_MODEL() Package = s.GET_PACKAGE_MODEL()
if TYPE_CHECKING: if TYPE_CHECKING:
from epdb.logic import SPathway from epdb.logic import SPathway, GroupManager
class LicenseExportSchema(Schema): class LicenseExportSchema(Schema):
@ -123,8 +123,8 @@ class PESCompoundExportSchema(RefCompoundExportSchema):
description: str description: str
aliases: List[str] aliases: List[str]
default_structure: RefCompoundStructureExportSchema default_structure: RefCompoundStructureExportSchema
structures: List["CompoundStructureExportSchema"]
structures: List["PESCompoundStructureExportSchema"] structures: List["PESCompoundStructureExportSchema"]
scenarios: List[RefScenarioExportSchema]
class PESCompoundStructureExportSchema(RefCompoundStructureExportSchema): class PESCompoundStructureExportSchema(RefCompoundStructureExportSchema):
@ -277,7 +277,7 @@ class PackageExportSchema(Schema):
@staticmethod @staticmethod
def resolve_classification_level(obj): def resolve_classification_level(obj):
if isinstance(obj, str): if isinstance(obj, dict):
return obj["classification_level"] return obj["classification_level"]
return obj.Classification(obj.classification_level).name return obj.Classification(obj.classification_level).name
@ -602,15 +602,20 @@ class PackageImporter:
package_license = License.objects.get(link=parsed.license.link) if parsed.license else None package_license = License.objects.get(link=parsed.license.link) if parsed.license else None
package_classification_level = Package.Classification[parsed.classification_level.upper()] package_classification_level = Package.Classification[parsed.classification_level.upper()]
package = Package.objects.create( print(parsed.classification_level, "->", package_classification_level)
uuid=package_uuid,
name=f"{parsed.name} - Imported at {datetime.now()}", package = Package()
description=parsed.description, package.uuid = package_uuid
reviewed=False, # Everything will be imported as non reviewed package.name = f"{parsed.name} - Imported at {datetime.now()}"
license=package_license, package.description = parsed.description
classification_level=package_classification_level, package.reviewed = False
data_pool=parsed.data_pool, package.license = package_license
) package.classification_level = package_classification_level
if package_classification_level == Package.Classification.SECRET:
package.data_pool = Group.objects.get(uuid=parsed.data_pool.uuid)
package.save()
# Import Elements # Import Elements
self._import_compounds(package, parsed.compounds) self._import_compounds(package, parsed.compounds)