Merge pull request #8 from ESA-PhiLab/0.1.12

Author: sirbastiano

how_to_start.ipynb

@@ -9,6 +9,7 @@
 import yaml
 import argparse
 import getpass
+import sys
 from typing import Tuple
 
 
@@ -27,13 +28,24 @@ def load_credentials(file_name: str = 'secret.yml') -> Tuple[str, str]:
         yaml.YAMLError: If the YAML file is invalid or cannot be written properly.
         KeyError: If expected keys are missing in the YAML structure.
     """
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    secrets_file_path = os.path.join(script_dir, file_name)
+    # First, check for secret.yml in the current working directory
+    cwd_secrets_file_path = os.path.join(os.getcwd(), file_name)
+    if os.path.isfile(cwd_secrets_file_path):
+        secrets_file_path = cwd_secrets_file_path
+    else:
+        # Fallback: check for secret.yml in the script directory
+        script_dir = os.path.dirname(os.path.abspath(__file__))
+        secrets_file_path = os.path.join(script_dir, file_name)
 
+    # Always prompt if not found, even in Jupyter or import context
     if not os.path.isfile(secrets_file_path):
-        print(f"Secrets file not found: {secrets_file_path}")
-        username = input("Enter username: ").strip()
-        password = getpass.getpass("Enter password: ").strip()
+        try:
+            # For Jupyter, input and getpass work as expected
+            print(f"Secrets file not found: {secrets_file_path}")
+            username = input("Enter username: ").strip()
+            password = getpass.getpass("Enter password: ").strip()
+        except Exception as e:
+            raise RuntimeError(f"Could not prompt for credentials: {e}")
 
         secrets = {
             'credentials': {
@@ -111,7 +123,7 @@ def get_access_token(config, username, password):
         return access_token
     else:
         print(f"Failed to retrieve access token. Status code: {response.status_code}")
-        exit(1)
+        sys.exit(1)
 
 
 def get_eo_product_details(config, headers, eo_product_name):
@@ -125,7 +137,7 @@ def get_eo_product_details(config, headers, eo_product_name):
         return eo_product_data["Id"], eo_product_data["S3Path"]
     else:
         print(f"Failed to retrieve EO product details. Status code: {response.status_code}")
-        exit(1)
+        sys.exit(1)
 
 
 def get_temporary_s3_credentials(headers):
@@ -147,11 +159,11 @@ def get_temporary_s3_credentials(headers):
         else:
             print("Error: Access denied. Please check your permissions or access token.")
         print(f"Response Body: {credentials_response.text}")
-        exit(1)
+        sys.exit(1)
     else:
         print(f"Failed to create temporary S3 credentials. Status code: {credentials_response.status_code}")
         print(f"Response Body: {credentials_response.text}")
-        exit(1)
+        sys.exit(1)
 
 
 def format_filename(filename, length=40):
@@ -281,6 +293,7 @@ def pull_down(product_name=None, args=None):
         description="Script to download EO product using OData and S3 protocol.",
         epilog="Example usage: python script.py -u <username> -p <password> <eo_product_name>"
     )
+    parser.add_argument('--init-secret', action='store_true', help='Prompt for credentials and create/overwrite secret.yml, then exit')
     # User credentials
     username, password = load_credentials()
     # Add command line arguments
@@ -289,10 +302,20 @@ def pull_down(product_name=None, args=None):
     parser.add_argument('-eo_product_name', type=str, help='Name of the Earth Observation product to be downloaded (required)')
     args = parser.parse_args()
 
+    if args.init_secret:
+        # Force prompt and overwrite secret.yml using load_credentials
+        try:
+            username, password = load_credentials(file_name='secret.yml')
+            print("Secrets file created/updated successfully.")
+        except Exception as e:
+            print(f"Error creating/updating secrets file: {e}")
+            sys.exit(1)
+
     # Prompt for missing credentials
     if not args.username:
         args.username = input("Enter username: ")
     if not args.password:
         args.password = input("Enter password: ")
 
     pull_down(product_name=args.eo_product_name, args=args)
+    sys.exit(0)

pdm.lock

@@ -182,20 +182,20 @@ def _get_valid_product_types(self, collection_name):
     def _validate_product_type(self):
         """
         Validates the provided product type against a list of valid product types.
+        If the product type is None, the validation is skipped.
 
         Raises:
-            ValueError: If the product type is None, empty, or not in the list of valid product types.
+            ValueError: If the product type is not in the list of valid product types.
             TypeError: If the product type is not a string.
         """
-        valid_product_types = self._get_valid_product_types(self.collection_name)
-        if self.product_type is None:
-            raise ValueError("Product type cannot be None")
-        if not isinstance(self.product_type, str):
-            raise TypeError("Product type must be a string")
-        if not self.product_type:
-            raise ValueError("Product type cannot be empty")
-        if self.product_type not in valid_product_types:
-            raise ValueError(f"Invalid product type: {self.product_type}. Must be one of: {', '.join(valid_product_types)}")
+        if self.product_type is not None:
+            valid_product_types = self._get_valid_product_types(self.collection_name)
+            if not isinstance(self.product_type, str):
+                raise TypeError("Product type must be a string")
+            if not self.product_type:
+                raise ValueError("Product type cannot be empty")
+            if self.product_type not in valid_product_types:
+                raise ValueError(f"Invalid product type: {self.product_type}. Must be one of: {', '.join(valid_product_types)}")
 
     def _validate_order_by(self):
         """

phidown/downloader.py

@@ -1,6 +1,6 @@
 [project]
 name = "phidown"
-version = "0.1.11"
+version = "0.1.12"
 description = "A project using AWS services and dataset tools for Sentinel data"
 authors = [
   { name = "Roberto Del Prete", email = "roberto.delprete@esa.int" }
@@ -10,11 +10,10 @@ dependencies = [
   "boto3>=1.37.34",       # changed from exact to minimum version
   "numpy>=1.6",           # changed from >1.6 (not typical) to >=1.6
   "pandas>=1.5.2",        # keep as is, already minimum version
-  "dataset-tools>=0.1.6", # changed from exact to minimum
   "supervisely>=6.73.338",# changed from exact to minimum
-  "pyaml>=25.1.0",        # keep as is
-  "ipykernel>=6.29.5",    # keep as is
-  "zstandard>=0.23.0",    # keep as is
+  "pyaml>=25.1.0",        
+  "ipykernel>=6.29.5",    
+  "zstandard>=0.23.0", 
 ]
 
 requires-python = ">=3.9"

phidown/search.py

@@ -260,7 +260,7 @@ To authenticate with the Copernicus Data Space Ecosystem, you need to create a `
 2. Add the following content to the file, replacing `your_username` and `your_password` with your actual credentials:
 
   ```yaml
-  # filepath: ./phidown/secret.yml
+  # filepath: ./phidown/secret.yml or the current working directory where phidown is launched
   copernicus:
     username: <your_username>
     password: <your_password>