Merge branch 'GONRG-3452_Move_ingestion_logic_from_SD' into 'master'

GONRG-3452: Move ingestion logic from SDK

See merge request osdu/platform/data-flow/ingestion/energistics-osdu-integration!37

build/requirements.txt

@@ -5,5 +5,11 @@ tenacity
 
 dataclasses==0.8;python_version<"3.7"
 
---extra-index-url https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-osdu_api==0.10.1.dev0+ad9ff99f
+--extra-index-url=https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
+osdu-api==0.12.0.dev213
+
+--extra-index-url=https://community.opengroup.org/api/v4/projects/668/packages/pypi/simple/
+osdu-airflow>=0.12.0dev
+
+--extra-index-url https://community.opengroup.org/api/v4/projects/823/packages/pypi/simple
+osdu-ingestion>=0.12.0dev

energistics/src/dags/requirements.txt

 # It needs to be installed in Airflow Environment
+--extra-index-url=https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
+osdu-api==0.12.0
+
 --extra-index-url=https://community.opengroup.org/api/v4/projects/668/packages/pypi/simple/
-osdu-airflow==0.0.1
+osdu-airflow==0.12.0
+
+-extra-index-url https://community.opengroup.org/api/v4/projects/823/packages/pypi/simple
+osdu-ingestion==0.12.0

energistics/src/docker_test/test_create_energistics_manifest.py

@@ -22,9 +22,9 @@ import jsonschema
 import pytest
 import create_energistics_manifest
 from data_file_paths import TRAJECTORY_XML_FILE_PATH, MANIFEST_SCHEMA_FILE_PATH
-from osdu_api.libs.refresh_token import BaseTokenRefresher
-from osdu_api.libs.context import Context
-from osdu_api.libs.handle_file import FileHandler
+from osdu_ingestion.libs.refresh_token import BaseTokenRefresher
+from osdu_ingestion.libs.context import Context
+from osdu_ingestion.libs.handle_file import FileHandler
 
 MOCK_EXECUTION_CONTEXT = {
     "Context": {

energistics/src/witsml_parser/create_energistics_manifest.py

@@ -23,12 +23,12 @@ import json
 import dataclasses
 import requests
 import tenacity
-from osdu_api.libs.auth.authorization import TokenRefresher
-from osdu_api.libs.context import Context
-from osdu_api.libs.handle_file import FileHandler
-from osdu_api.libs.utils import remove_trailing_colon
+from osdu_api.auth.authorization import TokenRefresher
 from osdu_api.clients.dataset.dataset_dms_client import DatasetDmsClient
 from osdu_api.configuration.config_manager import DefaultConfigManager
+from osdu_ingestion.libs.context import Context
+from osdu_ingestion.libs.handle_file import FileHandler
+from osdu_ingestion.libs.utils import remove_trailing_colon
 from energistics.libs.energistics_parsers import parse_witsml_file, FileInfo
 
 RETRIES = 3

energistics/src/witsml_parser/main.py

@@ -20,9 +20,9 @@ import json
 import logging
 
 from create_energistics_manifest import EnergisticsManifestCreator
-from osdu_api.libs.context import Context
-from osdu_api.libs.handle_file import FileHandler
-from osdu_api.libs.refresh_token import BaseTokenRefresher
+from osdu_ingestion.libs.context import Context
+from osdu_ingestion.libs.handle_file import FileHandler
+from osdu_ingestion.libs.refresh_token import BaseTokenRefresher
 
 logger = logging.getLogger()