Skip to content

Remove bw2data parameterization #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmutel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove bw2data parameterization #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bw2data/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"Node",
"Normalization",
"normalizations",
"parameters",
# "parameters",
"preferences",
"prepare_lca_inputs",
"ProcessedDataStore",
Expand Down Expand Up @@ -80,7 +80,7 @@
mapping = Mapping()

from bw2data.updates import Updates
from bw2data.parameters import parameters
# from bw2data.parameters import parameters

Updates.check_status()

Expand Down
36 changes: 18 additions & 18 deletions bw2data/backends/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,24 +787,24 @@ def purge(dct: dict) -> dict:
ExchangeDataset.delete().where(ExchangeDataset.output_database == self.name).execute()
IndexManager(self.filename).delete_database()

if not keep_params:
from bw2data.parameters import (
ActivityParameter,
DatabaseParameter,
ParameterizedExchange,
)

groups = tuple(
{
o[0]
for o in ActivityParameter.select(ActivityParameter.group)
.where(ActivityParameter.database == self.name)
.tuples()
}
)
ParameterizedExchange.delete().where(ParameterizedExchange.group << groups).execute()
ActivityParameter.delete().where(ActivityParameter.database == self.name).execute()
DatabaseParameter.delete().where(DatabaseParameter.database == self.name).execute()
# if not keep_params:
# from bw2data.parameters import (
# ActivityParameter,
# DatabaseParameter,
# ParameterizedExchange,
# )

# groups = tuple(
# {
# o[0]
# for o in ActivityParameter.select(ActivityParameter.group)
# .where(ActivityParameter.database == self.name)
# .tuples()
# }
# )
# ParameterizedExchange.delete().where(ParameterizedExchange.group << groups).execute()
# ActivityParameter.delete().where(ActivityParameter.database == self.name).execute()
# DatabaseParameter.delete().where(DatabaseParameter.database == self.name).execute()

if vacuum_needed:
sqlite3_lci_db.vacuum()
Expand Down
28 changes: 14 additions & 14 deletions bw2data/backends/proxies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def key(self):

def delete(self, signal: bool = True):
from bw2data import Database, calculation_setups
from bw2data.parameters import ActivityParameter, ParameterizedExchange
# from bw2data.parameters import ActivityParameter, ParameterizedExchange

def purge(obj: Activity, dct: dict) -> dict:
return {
Expand All @@ -273,15 +273,15 @@ def purge(obj: Activity, dct: dict) -> dict:
if key != obj._data["id"] and key != (obj._data["database"], obj._data["code"])
}

try:
ap = ActivityParameter.get(database=self[0], code=self[1])
ParameterizedExchange.delete().where(ParameterizedExchange.group == ap.group).execute()
ActivityParameter.delete().where(
ActivityParameter.database == self[0], ActivityParameter.code == self[1]
).execute()
except ActivityParameter.DoesNotExist:
pass
IndexManager(Database(self["database"]).filename).delete_dataset(self._data)
# try:
# ap = ActivityParameter.get(database=self[0], code=self[1])
# ParameterizedExchange.delete().where(ParameterizedExchange.group == ap.group).execute()
# ActivityParameter.delete().where(
# ActivityParameter.database == self[0], ActivityParameter.code == self[1]
# ).execute()
# except ActivityParameter.DoesNotExist:
# pass
# IndexManager(Database(self["database"]).filename).delete_dataset(self._data)
self.exchanges().delete(allow_in_sourced_project=True)
self.upstream().delete(allow_in_sourced_project=True)

Expand Down Expand Up @@ -603,11 +603,11 @@ def save(self, signal: bool = True, data_already_set: bool = False, force_insert
self._document.save(signal=signal, force_insert=force_insert)

def delete(self, signal: bool = True):
from bw2data.parameters import ParameterizedExchange
# from bw2data.parameters import ParameterizedExchange

ParameterizedExchange.delete().where(
ParameterizedExchange.exchange == self._document.id
).execute()
# ParameterizedExchange.delete().where(
# ParameterizedExchange.exchange == self._document.id
# ).execute()
self._document.delete_instance(signal=signal)
databases.set_dirty(self["output"][0])
self = None
Loading