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

Jump to bottom

Use the new version for the McM REST client #3750

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Use the new version for the McM REST client #3750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a944f5b
Use the new version for the McM REST client
ggonzr Aug 20, 2024
9bab77e
Load the old version in case the `McM` package is not installed
ggonzr Aug 30, 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
40 changes: 26 additions & 14 deletions bin/utils/request_fragment_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/env python3
import os
import warnings
import sys
import re
import argparse
Expand All @@ -11,9 +12,6 @@
import json
import ast
from datetime import datetime
#
#sys.path.append('/afs/cern.ch/cms/PPD/PdmV/tools/McM-QA/')
#from rest import McM
from json import dumps

parser = argparse.ArgumentParser(
Expand Down Expand Up @@ -56,8 +54,31 @@

# Use no-id as identification mode in order not to use a SSO cookie
if args.local is False:
sys.path.append('/afs/cern.ch/cms/PPD/PdmV/tools/McM-QA/')
from rest import McM
try:
from rest import McM
except ModuleNotFoundError as e:
old_version_afs = '/afs/cern.ch/cms/PPD/PdmV/tools/McM'
try:
# INFO: Temporarily load the old version to avoid crashes with non-updated user code.
sys.path.append(old_version_afs)
from rest import McM

version_msg = (
"An old version of the McM module has been loaded from: %s. "
"This is a temporal patch to avoid unforeseen import errors with user's code. "
"Install a recent version following the instructions available at "
"https://github.com/cms-PdmV/mcm_scripts for future executions."
) % (old_version_afs)
warnings.warn(version_msg, DeprecationWarning)

except ModuleNotFoundError as e:
import_msg = (
"Install this module in your execution environment "
"by following the instructions available at: "
"https://github.com/cms-PdmV/mcm_scripts"
)
raise ModuleNotFoundError(import_msg) from e

mcm = McM(id=None, dev=args.dev, debug=args.debug)
mcm_link = mcm.server

Expand All @@ -78,15 +99,6 @@ def get_request(prepid):
result = result.get('results', {})
return result

#def get_request(prepid):
# result = mcm._McM__get('public/restapi/requests/get/%s' % (prepid))
# if not result:
# return {}
#
# result = result.get('results', {})
# return result


def get_range_of_requests(query):
result = mcm._McM__put('public/restapi/requests/listwithfile', data={'contents': query})
if not result:
Expand Down