Skip to content
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

PEP8 fixes for PR #2364 (bkgquery_improv) by autopep8 #2365

Merged
merged 3 commits into from
Jun 20, 2024
Merged

PEP8 fixes for PR #2364 (bkgquery_improv) by autopep8 #2365

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8161d9f
autopep8 action fixes
mesmith75 Jun 19, 2024
490eaa6
Merge branch 'develop' into autopep8-patches/bkgquery_improv
mesmith75 Jun 20, 2024
bcd3b45
Update BKQuery.py
mesmith75 Jun 20, 2024
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
34 changes: 19 additions & 15 deletions ganga/GangaLHCb/Lib/LHCbDataset/BKQuery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
# \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
import os
import datetime
from GangaCore.Core.exceptions import GangaException
Expand All @@ -14,7 +14,7 @@
from GangaLHCb.Lib.LHCbDataset import LHCbDataset, LHCbCompressedDataset
from GangaLHCb.Lib.Backends.Dirac import filterLFNsBySE
logger = getLogger()
#\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
# \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#


class BKQuery(GangaObject):
Expand Down Expand Up @@ -101,7 +101,7 @@ class BKQuery(GangaObject):
schema['SMOG2'] = SimpleItem(defvalue='', typelist=['str', 'list'],
doc='Specify the state of SMOG2')
schema['retry_limit'] = SimpleItem(defvalue=1, typelist=['int'],
doc='Number of times to retry the DIRAC commands')
doc='Number of times to retry the DIRAC commands')
_schema = Schema(Version(1, 2), schema)
_category = 'query'
_name = "BKQuery"
Expand Down Expand Up @@ -129,16 +129,16 @@ def getDatasetMetadata(self):
msg = 'selection not supported for type="%s".' % self.type
raise GangaException(msg)
cmd = "getDataset('%s','%s','%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
knownLists = [tuple, list, GangaList]
if isType(self.dqflag, knownLists):
cmd = "getDataset('%s',%s,'%s','%s','%s','%s', '%s')" % (self.path, self.dqflag,
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)

try:
value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements,
retry_limit = self.retry_limit)
retry_limit=self.retry_limit)
except GangaDiracError as err:
return {'OK': False, 'Value': str(err)}

Expand Down Expand Up @@ -173,13 +173,17 @@ def getDataset(self, compressed=True, SE=None):
msg = 'selection not supported for type="%s".' % self.type
raise GangaException(msg)
cmd = "getDataset('%s','%s','%s','%s','%s','%s', %s)" % (self.path, self.dqflag,
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
self.type, self.startDate, self.endDate, self.selection, self.SMOG2)
from GangaCore.GPIDev.Lib.GangaList.GangaList import GangaList
knownLists = [tuple, list, GangaList]
if isType(self.dqflag, knownLists):
cmd = "getDataset('%s',%s,'%s','%s','%s','%s', %s)" % (self.path, self.dqflag, self.type, self.startDate,
self.endDate, self.selection, self.SMOG2)
result = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements, retry_limit = self.retry_limit)
self.endDate, self.selection, self.SMOG2)
result = get_result(
cmd,
'BK query error.',
credential_requirements=self.credential_requirements,
retry_limit=self.retry_limit)
logger.debug("Finished Running Command")
files = []
value = result
Expand Down Expand Up @@ -209,7 +213,7 @@ def getDataset(self, compressed=True, SE=None):
logger.debug('Detected an MC data set. Checking if it has been archived')
all_reps = get_result("getReplicas(%s)" % files, 'Get replica error.',
credential_requirements=self.credential_requirements,
retry_limit = self.retry_limit)
retry_limit=self.retry_limit)
if 'Successful' in all_reps:
all_ses = set([])
for _lfn, _repz in all_reps['Successful'].items():
Expand All @@ -219,7 +223,7 @@ def getDataset(self, compressed=True, SE=None):
for _se in all_ses:
is_archived = get_result("isSEArchive('%s')" % _se, 'Check archive error.',
credential_requirements=self.credential_requirements,
retry_limit = self.retry_limit)
retry_limit=self.retry_limit)
if not is_archived:
all_archived = False
break
Expand All @@ -246,7 +250,7 @@ def getDataset(self, compressed=True, SE=None):

return addProxy(ds)

#\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
# \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#


class BKQueryDict(GangaObject):
Expand Down Expand Up @@ -300,7 +304,7 @@ def getDatasetMetadata(self):
cmd = 'bkQueryDict(%s)' % self.dict
try:
value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements,
retry_limit = self.retry_limit)
retry_limit=self.retry_limit)
except GangaDiracError as err:
return {'OK': False, 'Value': {}}

Expand All @@ -323,7 +327,7 @@ def getDataset(self):
return None
cmd = 'bkQueryDict(%s)' % self.dict
value = get_result(cmd, 'BK query error.', credential_requirements=self.credential_requirements,
retry_limit = self.retry_limit)
retry_limit=self.retry_limit)

files = []
if 'LFNs' in value:
Expand All @@ -338,4 +342,4 @@ def getDataset(self):

return addProxy(ds)

#\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#
# \/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\#