Create subfolder and updated path accordinly (#393)

IMAP-Science-Operations-Center · Nov 18, 2024 · 9a008ce · 9a008ce
1 parent 6d95102
commit 9a008ce
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 26 deletions.
diff --git a/sds_data_manager/constructs/database_construct.py b/sds_data_manager/constructs/database_construct.py
@@ -126,7 +126,7 @@ def __init__(
             id="CreateMetadataSchema",
             function_name="create-schema",
             code=code,
-            handler="SDSCode.create_schema.lambda_handler",
+            handler="SDSCode.pipeline_lambdas.create_schema.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.seconds(60),
             memory_size=1000,

diff --git a/sds_data_manager/constructs/indexer_lambda_construct.py b/sds_data_manager/constructs/indexer_lambda_construct.py
@@ -63,7 +63,7 @@ def __init__(
             id="IndexerLambda",
             function_name="file-indexer",
             code=code,
-            handler="SDSCode.indexer.lambda_handler",
+            handler="SDSCode.pipeline_lambdas.indexer.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.minutes(1),
             memory_size=1000,

diff --git a/sds_data_manager/constructs/instrument_lambdas.py b/sds_data_manager/constructs/instrument_lambdas.py
@@ -77,7 +77,7 @@ def __init__(
             "BatchStarterLambda",
             function_name="BatchStarterLambda",
             code=code,
-            handler="SDSCode.batch_starter.lambda_handler",
+            handler="SDSCode.pipeline_lambdas.batch_starter.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             environment=lambda_environment,
             memory_size=512,

diff --git a/sds_data_manager/constructs/sds_api_manager_construct.py b/sds_data_manager/constructs/sds_api_manager_construct.py
@@ -76,7 +76,7 @@ def __init__(
             id="UploadAPILambda",
             function_name="upload-api-handler",
             code=code,
-            handler="SDSCode.upload_api.lambda_handler",
+            handler="SDSCode.api_lambdas.upload_api.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.minutes(1),
             memory_size=1000,
@@ -108,7 +108,7 @@ def __init__(
             id="QueryAPILambda",
             function_name="query-api-handler",
             code=code,
-            handler="SDSCode.query_api.lambda_handler",
+            handler="SDSCode.api_lambdas.query_api.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.minutes(1),
             memory_size=1000,
@@ -135,7 +135,7 @@ def __init__(
             id="DownloadAPILambda",
             function_name="download-api-handler",
             code=code,
-            handler="SDSCode.download_api.lambda_handler",
+            handler="SDSCode.api_lambdas.download_api.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.minutes(1),
             environment={
@@ -160,7 +160,7 @@ def __init__(
             id="universal-spin-table-api-handler",
             function_name="universal-spin-table-api-handler",
             code=code,
-            handler="SDSCode.spin_table_api.lambda_handler",
+            handler="SDSCode.api_lambdas.spin_table_api.lambda_handler",
             runtime=lambda_.Runtime.PYTHON_3_12,
             timeout=cdk.Duration.minutes(1),
             memory_size=1000,

diff --git a/sds_data_manager/lambda_code/SDSCode/api_lambdas/__init__.py b/sds_data_manager/lambda_code/SDSCode/api_lambdas/__init__.py
diff --git a/...nager/lambda_code/SDSCode/download_api.py → ..._code/SDSCode/api_lambdas/download_api.py b/...nager/lambda_code/SDSCode/download_api.py → ..._code/SDSCode/api_lambdas/download_api.py
diff --git a/..._manager/lambda_code/SDSCode/query_api.py → ...bda_code/SDSCode/api_lambdas/query_api.py b/..._manager/lambda_code/SDSCode/query_api.py → ...bda_code/SDSCode/api_lambdas/query_api.py
@@ -6,8 +6,8 @@
 
 from sqlalchemy import select
 
-from .database import database as db
-from .database import models
+from ..database import database as db
+from ..database import models
 
 # Logger setup
 logger = logging.getLogger(__name__)

diff --git a/...ger/lambda_code/SDSCode/spin_table_api.py → ...ode/SDSCode/api_lambdas/spin_table_api.py b/...ger/lambda_code/SDSCode/spin_table_api.py → ...ode/SDSCode/api_lambdas/spin_table_api.py
diff --git a/...manager/lambda_code/SDSCode/upload_api.py → ...da_code/SDSCode/api_lambdas/upload_api.py b/...manager/lambda_code/SDSCode/upload_api.py → ...da_code/SDSCode/api_lambdas/upload_api.py
diff --git a/sds_data_manager/lambda_code/SDSCode/pipeline_lambdas/__init__.py b/sds_data_manager/lambda_code/SDSCode/pipeline_lambdas/__init__.py
diff --git a/...ager/lambda_code/SDSCode/batch_starter.py → ...SDSCode/pipeline_lambdas/batch_starter.py b/...ager/lambda_code/SDSCode/batch_starter.py → ...SDSCode/pipeline_lambdas/batch_starter.py
@@ -9,9 +9,9 @@
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 
+from ..database import database as db
+from ..database import models
 from . import dependency_config
-from .database import database as db
-from .database import models
 
 # Logger setup
 logger = logging.getLogger(__name__)

diff --git a/...ager/lambda_code/SDSCode/create_schema.py → ...SDSCode/pipeline_lambdas/create_schema.py b/...ager/lambda_code/SDSCode/create_schema.py → ...SDSCode/pipeline_lambdas/create_schema.py
diff --git a/...lambda_code/SDSCode/dependency_config.csv → ...de/pipeline_lambdas/dependency_config.csv b/...lambda_code/SDSCode/dependency_config.csv → ...de/pipeline_lambdas/dependency_config.csv
diff --git a/.../lambda_code/SDSCode/dependency_config.py → ...ode/pipeline_lambdas/dependency_config.py b/.../lambda_code/SDSCode/dependency_config.py → ...ode/pipeline_lambdas/dependency_config.py
diff --git a/...ta_manager/lambda_code/SDSCode/indexer.py → ..._code/SDSCode/pipeline_lambdas/indexer.py b/...ta_manager/lambda_code/SDSCode/indexer.py → ..._code/SDSCode/pipeline_lambdas/indexer.py
@@ -8,8 +8,8 @@
 import boto3
 from imap_data_access import ScienceFilePath
 
-from .database import database as db
-from .database import models
+from ..database import database as db
+from ..database import models
 from .lambda_custom_events import IMAPLambdaPutEvent
 
 # Logger setup

diff --git a/...mbda_code/SDSCode/lambda_custom_events.py → .../pipeline_lambdas/lambda_custom_events.py b/...mbda_code/SDSCode/lambda_custom_events.py → .../pipeline_lambdas/lambda_custom_events.py
diff --git a/tests/infrastructure/test_database_construct.py b/tests/infrastructure/test_database_construct.py
@@ -82,7 +82,7 @@ def test_create_schema(template):
         props={
             "FunctionName": "create-schema",
             "Runtime": "python3.12",
-            "Handler": "SDSCode.create_schema.lambda_handler",
+            "Handler": "SDSCode.pipeline_lambdas.create_schema.lambda_handler",
             "MemorySize": 1000,
             "Timeout": 60,
             "Role": {

diff --git a/tests/lambda_endpoints/test_batch_starter.py b/tests/lambda_endpoints/test_batch_starter.py
@@ -7,18 +7,18 @@
 from imap_data_access import ScienceFilePath
 from sqlalchemy.exc import IntegrityError
 
-from sds_data_manager.lambda_code.SDSCode import batch_starter
-from sds_data_manager.lambda_code.SDSCode.batch_starter import (
-    get_downstream_dependencies,
-    get_file,
-    is_job_in_processing_table,
-    lambda_handler,
-)
 from sds_data_manager.lambda_code.SDSCode.database import models
 from sds_data_manager.lambda_code.SDSCode.database.models import (
     ProcessingJob,
     ScienceFiles,
 )
+from sds_data_manager.lambda_code.SDSCode.pipeline_lambdas import batch_starter
+from sds_data_manager.lambda_code.SDSCode.pipeline_lambdas.batch_starter import (
+    get_downstream_dependencies,
+    get_file,
+    is_job_in_processing_table,
+    lambda_handler,
+)
 
 from .conftest import POSTGRES_AVAILABLE
 

diff --git a/tests/lambda_endpoints/test_download_api.py b/tests/lambda_endpoints/test_download_api.py
@@ -1,6 +1,6 @@
 """Tests for the Download API."""
 
-from sds_data_manager.lambda_code.SDSCode import download_api
+from sds_data_manager.lambda_code.SDSCode.api_lambdas import download_api
 
 
 def test_object_exists(s3_client):

diff --git a/tests/lambda_endpoints/test_indexer_lambda.py b/tests/lambda_endpoints/test_indexer_lambda.py
@@ -7,9 +7,9 @@
 from imap_data_access import ScienceFilePath
 from sqlalchemy import select
 
-from sds_data_manager.lambda_code.SDSCode import indexer
 from sds_data_manager.lambda_code.SDSCode.database import models
-from sds_data_manager.lambda_code.SDSCode.indexer import (
+from sds_data_manager.lambda_code.SDSCode.pipeline_lambdas import indexer
+from sds_data_manager.lambda_code.SDSCode.pipeline_lambdas.indexer import (
     send_event_from_indexer,
 )
 

diff --git a/tests/lambda_endpoints/test_query_api.py b/tests/lambda_endpoints/test_query_api.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from sds_data_manager.lambda_code.SDSCode import query_api
+from sds_data_manager.lambda_code.SDSCode.api_lambdas import query_api
 from sds_data_manager.lambda_code.SDSCode.database import models
 
 

diff --git a/tests/lambda_endpoints/test_upload_api.py b/tests/lambda_endpoints/test_upload_api.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from sds_data_manager.lambda_code.SDSCode import upload_api
+from sds_data_manager.lambda_code.SDSCode.api_lambdas import upload_api
 
 
 @pytest.fixture(autouse=True)