From d676ab048fa9c09e3c16059259599da14a0e9161 Mon Sep 17 00:00:00 2001
From: MGS-sails <mahfouzshehu@gmail.com>
Date: Mon, 21 Oct 2024 23:01:16 +0100
Subject: [PATCH 1/2] Adjusted run annotations import script to be accession
 agnostic

---
 .../commands/import_extra_run_annotations.py         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emgapianns/management/commands/import_extra_run_annotations.py b/emgapianns/management/commands/import_extra_run_annotations.py
index f68ba8203..c43a0ca83 100644
--- a/emgapianns/management/commands/import_extra_run_annotations.py
+++ b/emgapianns/management/commands/import_extra_run_annotations.py
@@ -7,7 +7,7 @@
 from django.core.management import BaseCommand
 
 logger = logging.getLogger(__name__)
-
+import re
 
 class Command(BaseCommand):
     help = "Imports a directory of GFFs that as 'extra run annotations', " \
@@ -61,15 +61,15 @@ def handle(self, *args, **options):
             logger.info('Looking for RO Crates (.zips')
             for file in Path(self.gffs_dir).glob('**/*.zip'):
                 logger.info(f'Handling RO Crate Zip file {file}')
-                # erz = 'ERZ' + file.name.split('ERZ')[1].strip('.zip')
                 logger.info('this is the FILE NAME ' +  file.name)
-                srr = 'SRR' + file.name.split('SRR')[1].strip('.zip')
+                accession_prefix = re.search(r'[A-Z]{3}\d+', file.name)
+                accession_prefix = accession_prefix.group().strip()
                 try:
-                    run = emg_models.Run.objects.get(accession=srr)
+                    run = emg_models.Run.objects.get(accession=accession_prefix)
                 except emg_models.Run.DoesNotExist:
-                    logger.warning(f'No Run found for RO Crate apparent ERZ {srr}')
+                    logger.warning(f'No Run found for RO Crate  {accession_prefix}')
                     continue
-                logger.info(f'Will upload RO Crate for {srr}')
+                logger.info(f'Will upload RO Crate for {accession_prefix}')
                 self.upload_rocrate(run, gffs_directory, file.name)
 
     def upload_rocrate(

From ba34640f30c73ba49a95253d4cd24896f367b2ae Mon Sep 17 00:00:00 2001
From: MGS-sails <mahfouzshehu@gmail.com>
Date: Tue, 22 Oct 2024 16:10:15 +0100
Subject: [PATCH 2/2] Bumped api version

---
 emgcli/__init__.py | 2 +-
 pyproject.toml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emgcli/__init__.py b/emgcli/__init__.py
index 6498eceaf..12000a6c1 100644
--- a/emgcli/__init__.py
+++ b/emgcli/__init__.py
@@ -1 +1 @@
-__version__: str = "2.4.49"
+__version__: str = "2.4.50"
diff --git a/pyproject.toml b/pyproject.toml
index 9e45f9243..07fe24dc6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -117,7 +117,7 @@ max-line-length = 119
 """
 
 [tool.bumpversion]
-current_version = "2.4.49"
+current_version = "2.4.50"
 
 [[tool.bumpversion.files]]
 filename = "emgcli/__init__.py"