Skip to content

Commit 4e87b56

Browse files
Dont load MACs (#91)
* reset limit to '' and fix config.deploy * handle empty 'limit' parameter * - Upgrade `py-ard` to 1.0.3 - Use pyard without loading MACs, saves time and disk space * Update memory for ValidateBuildOutputFunction * The imgt version can be 3 or 4 digits * Set timeout to 900 seconds.
1 parent c9062f4 commit 4e87b56

File tree

8 files changed

+13
-10
lines changed

8 files changed

+13
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ target/
6969
# pyenv python configuration file
7070
.python-version
7171
.venv*
72+
venv*
7273

7374
# Profiling tools
7475
profile*

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ pipeline.jobs.deploy:
249249

250250
config.deploy:
251251
$(MAKE) -C ${APP_NAME}/pipeline/ service.config.deploy
252-
$(MAKE) -C ${APP_NAME}/database/ config.deploy
252+
$(MAKE) -C ${APP_NAME}/database/ service.config.deploy
253253

254254
monitoring.create-subscriptions:
255255
$(MAKE) -C ${APP_NAME}/infrastructure service.monitoring.create-subscriptions

gfe-db/pipeline/config/pipeline-input.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"align": false,
33
"kir": false,
44
"mem_profile": false,
5-
"limit": "1000"
5+
"limit": ""
66
}

gfe-db/pipeline/functions/invoke_pipeline/app.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ def lambda_handler(event, context):
4949

5050
# limit is an integer
5151
try:
52-
if not isinstance(int(event['limit']), int):
53-
raise ValueError('limit must be an integer')
52+
# empty limit implies no limit
53+
if event['limit']:
54+
if not isinstance(int(event['limit']), int):
55+
raise ValueError('limit must be an integer')
5456
except ValueError:
5557
raise ValueError('limit must be an integer')
5658

@@ -150,7 +152,7 @@ def get_branches(owner, repo):
150152
return [branch["name"] for branch in branches]
151153

152154

153-
def is_valid_release(branch, release_pattern=r"^\d{3}0$"):
155+
def is_valid_release(branch, release_pattern=r"^\d{2,3}0$"):
154156
"""Returns True if the branch is a valid release, False if not"""
155157

156158
# IMGT/HLA release format string

gfe-db/pipeline/jobs/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8-slim-buster
1+
FROM --platform=linux/amd64 python:3.8-slim-buster
22

33
RUN apt update && \
44
apt-get install -y \

gfe-db/pipeline/jobs/build/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
py-ard==1.0.1
1+
py-ard==1.0.3
22
py-gfe==1.1.5
33
lxml==4.6.3
44
Pympler==0.9

gfe-db/pipeline/jobs/build/src/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ def process_allele(allele, alignments_dict, csv_path=None):
569569

570570
alleles = parse_dat(data_dir, dbversion)
571571

572-
ard = pyard.init(dbversion)
572+
ard = pyard.init(dbversion, data_dir="/tmp/gfe-pyard/", load_mac=False)
573573

574574
gfe_maker = GFE(
575575
verbose=verbose,

gfe-db/pipeline/template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ Resources:
506506
CodeUri: functions/validate_build_output/
507507
Handler: app.lambda_handler
508508
Runtime: python3.10
509-
MemorySize: 256
510-
Timeout: 60
509+
MemorySize: 1024
510+
Timeout: 900
511511
Architectures:
512512
- x86_64
513513
Environment:

0 commit comments

Comments
 (0)