From ffed8aab58f1fd9b9c8215d3afab05e9de329557 Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 21 Aug 2024 17:46:29 -0400 Subject: [PATCH 1/5] succinct quantity_label --- .../core/resource/management/commands/add_resource_defaults.py | 2 +- coldfront/plugins/sftocf/utils.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coldfront/core/resource/management/commands/add_resource_defaults.py b/coldfront/core/resource/management/commands/add_resource_defaults.py index 4c3758c0c..16e772014 100644 --- a/coldfront/core/resource/management/commands/add_resource_defaults.py +++ b/coldfront/core/resource/management/commands/add_resource_defaults.py @@ -114,7 +114,7 @@ def handle(self, *args, **options): defaults={'value': default_value} ) - quantity_label = "Quantity in TB" + quantity_label = "TB" if default_value == 20: quantity_label += " in 20T increments" diff --git a/coldfront/plugins/sftocf/utils.py b/coldfront/plugins/sftocf/utils.py index e46f24cbf..5c82019bf 100644 --- a/coldfront/plugins/sftocf/utils.py +++ b/coldfront/plugins/sftocf/utils.py @@ -601,6 +601,7 @@ def allocations(self): status__name__in=allocation_statuses, resources__in=self.connection_obj.get_corresponding_coldfront_resources() ) + return self._allocations @property def allocationquerymatches(self): From 12da5d45d21c98d2b26fee2da6d9fa1d1791a916 Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 21 Aug 2024 17:47:13 -0400 Subject: [PATCH 2/5] change resource not found logging level --- .../plugins/fasrc/management/commands/pull_resource_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coldfront/plugins/fasrc/management/commands/pull_resource_data.py b/coldfront/plugins/fasrc/management/commands/pull_resource_data.py index 0404ee2ed..56c373092 100644 --- a/coldfront/plugins/fasrc/management/commands/pull_resource_data.py +++ b/coldfront/plugins/fasrc/management/commands/pull_resource_data.py @@ -86,6 +86,6 @@ def handle(self, *args, **options): try: volume = [v for v in volumes if v['name'] == resource_name][0] except: - logger.error('resource not found in starfish: %s', resource) + logger.debug('resource not found in starfish: %s', resource) continue update_resource_attr_types_from_dict(resource, volume['attrs']) From 3400d00f00cd40e362223c5e0ce9a75fdf876a48 Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 21 Aug 2024 17:49:49 -0400 Subject: [PATCH 3/5] log identify_ad_group exceptions --- coldfront/plugins/ldap/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/coldfront/plugins/ldap/utils.py b/coldfront/plugins/ldap/utils.py index 89e797a80..b4e25aa96 100644 --- a/coldfront/plugins/ldap/utils.py +++ b/coldfront/plugins/ldap/utils.py @@ -668,6 +668,7 @@ def identify_ad_group(sender, **kwargs): ad_conn = LDAPConn() members, manager = ad_conn.return_group_members_manager(project_title) except Exception as e: + logger.exception(e) raise ValueError(f"ldap connection error: {e}") try: ifx_pi = get_user_model().objects.get(username=manager['sAMAccountName'][0]) From 5b330ef683bd1453767b795f49be4950807b1ff3 Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 21 Aug 2024 17:50:41 -0400 Subject: [PATCH 4/5] replace deprecated read_csv kwarg --- coldfront/plugins/fasrc/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coldfront/plugins/fasrc/utils.py b/coldfront/plugins/fasrc/utils.py index cf5fff796..741fe890e 100644 --- a/coldfront/plugins/fasrc/utils.py +++ b/coldfront/plugins/fasrc/utils.py @@ -137,9 +137,9 @@ def _standardize_nesefile(self): translator = dict(( kv.split('=') for kv in (l.strip('\n') for l in groupkey_file) )) - headers_df = pd.read_csv(header_file, header=0, delim_whitespace=True) + headers_df = pd.read_csv(header_file, header=0, sep='\s+') headers = headers_df.columns.values.tolist() - data = pd.read_csv(datafile, names=headers, delim_whitespace=True) + data = pd.read_csv(datafile, names=headers, sep='\s+') data = data.loc[data['pool'].str.contains('1')] data['lab'] = data['pool'].str.replace('1', '').str.replace('hugl', '').str.replace('hus3', '') data['server'] = 'nesetape' From 364f7b211320ce209aefacd8094b0e6466cfe60d Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 21 Aug 2024 17:52:01 -0400 Subject: [PATCH 5/5] change AllocationRequestSerializer resource attribute to ReadOnlyField --- coldfront/plugins/api/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coldfront/plugins/api/serializers.py b/coldfront/plugins/api/serializers.py index dd4ee7b58..d58e89236 100644 --- a/coldfront/plugins/api/serializers.py +++ b/coldfront/plugins/api/serializers.py @@ -99,7 +99,7 @@ class Meta: class AllocationRequestSerializer(serializers.ModelSerializer): project = serializers.SlugRelatedField(slug_field='title', read_only=True) - resource = serializers.SlugRelatedField(slug_field='name', read_only=True) + resource = serializers.ReadOnlyField(source='get_resources_as_string', read_only=True) status = serializers.SlugRelatedField(slug_field='name', read_only=True) fulfilled_date = serializers.DateTimeField(read_only=True) created_by = serializers.SerializerMethodField(read_only=True)