geeup - npm Package Compare versions

Comparing version 0.6.1 to 0.6.2

geeup.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: geeup
-Version: 0.6.1
+Version: 0.6.2
 Summary: Simple Client for Earth Engine Uploads
@@ -16,3 +16,3 @@ Home-page: https://github.com/samapriya/geeup
         [![Hits-of-Code](https://hitsofcode.com/github/samapriya/geeup?branch=master)](https://hitsofcode.com/github/samapriya/geeup?branch=master)
-        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7518782.svg)](https://doi.org/10.5281/zenodo.7518782)
+        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7606098.svg)](https://doi.org/10.5281/zenodo.7606098)
         [![PyPI version](https://badge.fury.io/py/geeup.svg)](https://badge.fury.io/py/geeup)
@@ -30,4 +30,4 @@ [![Downloads](https://pepy.tech/badge/geeup/month)](https://pepy.tech/project/geeup)
         ```
-        Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.5.9).
-        Zenodo. https://doi.org/10.5281/zenodo.7518782
+        Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.6.2).
+        Zenodo. https://doi.org/10.5281/zenodo.7606098
         ```
@@ -352,2 +352,7 @@
         
+        ### 0.6.2
+        - Removed call to shell
+        - Now prints status of task at task creation
+        - Overwrite option for both images and tables
+        
         ### 0.6.1
@@ -354,0 +359,0 @@ - Removed dependency on pipwin uses pipgeo instead

geeup/__init__.py

@@ -5,2 +5,2 @@ # -*- coding: utf-8 -*-
 __email__ = "[e-mail]"
-__version__ = "0.6.1"
+__version__ = "0.6.2"

geeup/batch_uploader.py

@@ -243,17 +243,12 @@ from __future__ import print_function
                             raise Exception
-                        with open(os.path.join(lp, "data.json"), "w") as outfile:
-                            json.dump(main_payload, outfile)
+                        request_id = ee.data.newTaskId()[0]
                         check_list = ['yes', 'y']
                         if overwrite is not None and overwrite.lower() in check_list:
-                            output = subprocess.check_output(
-                                f"earthengine upload image --manifest {os.path.join(lp, 'data.json')} -f",
-                                shell=True
-                            )
+                            output = ee.data.startIngestion(
+                                request_id, main_payload, allow_overwrite=True)
                         else:
-                            output = subprocess.check_output(
-                                f"earthengine upload image --manifest {os.path.join(lp, 'data.json')}",
-                                shell=True
-                            )
+                            output = ee.data.startIngestion(
+                                request_id, main_payload, allow_overwrite=False)
                         logging.info(
-                            f"Ingesting {current_image_no+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output.decode('ascii').strip().split(' ')[-1]}"
+                            f"Ingesting {current_image_no+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output['id']} & status {output['started']}"
                         )
@@ -260,0 +255,0 @@ except Exception as error:

geeup/tuploader.py

 __copyright__ = """
 
-    Copyright 2022 Samapriya Roy
+    Copyright 2023 Samapriya Roy
 
@@ -272,18 +272,11 @@ Licensed under the Apache License, Version 2.0 (the "License");
                                     raise Exception
-                                with open(
-                                    os.path.join(lp, "data.json"), "w"
-                                ) as outfile:
-                                    json.dump(main_payload, outfile)
+                                request_id = ee.data.newTaskId()[0]
                                 if overwrite is not None and overwrite.lower() in check_list:
-                                    output = subprocess.check_output(
-                                        f"earthengine upload table --manifest {os.path.join(lp, 'data.json')} -f",
-                                        shell=True
-                                    )
+                                    output = ee.data.startTableIngestion(
+                                        request_id, main_payload, allow_overwrite=True)
                                 else:
-                                    output = subprocess.check_output(
-                                        f"earthengine upload table --manifest {os.path.join(lp, 'data.json')}",
-                                        shell=True
-                                    )
+                                    output = ee.data.startTableIngestion(
+                                        request_id, main_payload, allow_overwrite=False)
                                 logging.info(
-                                    f"Ingesting {i+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output.decode('ascii').strip().split(' ')[-1]}"
+                                    f"Ingesting {i+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output['id']} & status {output['started']}"
                                 )
@@ -341,13 +334,11 @@ elif base_ext == ".csv":
                                     raise Exception
-                                with open(
-                                    os.path.join(lp, "data.json"), "w"
-                                ) as outfile:
-                                    json.dump(main_payload, outfile)
-                                manifest_file = os.path.join(lp, "data.json")
-                                output = subprocess.check_output(
-                                    f"earthengine upload table --manifest {manifest_file}",
-                                    shell=True,
-                                )
+                                request_id = ee.data.newTaskId()[0]
+                                if overwrite is not None and overwrite.lower() in check_list:
+                                    output = ee.data.startTableIngestion(
+                                        request_id, main_payload, allow_overwrite=True)
+                                else:
+                                    output = ee.data.startTableIngestion(
+                                        request_id, main_payload, allow_overwrite=False)
                                 logging.info(
-                                    f"Ingesting {i+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output.decode('ascii').strip().split(' ')[-1]}"
+                                    f"Ingesting {i+1} of {file_count} {str(os.path.basename(asset_full_path))} with Task Id: {output['id']} & status {output['started']}"
                                 )
@@ -354,0 +345,0 @@ except Exception as error:

PKG-INFO

 Metadata-Version: 2.1
 Name: geeup
-Version: 0.6.1
+Version: 0.6.2
 Summary: Simple Client for Earth Engine Uploads
@@ -16,3 +16,3 @@ Home-page: https://github.com/samapriya/geeup
         [![Hits-of-Code](https://hitsofcode.com/github/samapriya/geeup?branch=master)](https://hitsofcode.com/github/samapriya/geeup?branch=master)
-        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7518782.svg)](https://doi.org/10.5281/zenodo.7518782)
+        [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7606098.svg)](https://doi.org/10.5281/zenodo.7606098)
         [![PyPI version](https://badge.fury.io/py/geeup.svg)](https://badge.fury.io/py/geeup)
@@ -30,4 +30,4 @@ [![Downloads](https://pepy.tech/badge/geeup/month)](https://pepy.tech/project/geeup)
         ```
-        Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.5.9).
-        Zenodo. https://doi.org/10.5281/zenodo.7518782
+        Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.6.2).
+        Zenodo. https://doi.org/10.5281/zenodo.7606098
         ```
@@ -352,2 +352,7 @@
         
+        ### 0.6.2
+        - Removed call to shell
+        - Now prints status of task at task creation
+        - Overwrite option for both images and tables
+        
         ### 0.6.1
@@ -354,0 +359,0 @@ - Removed dependency on pipwin uses pipgeo instead

README.md

@@ -8,3 +8,3 @@ # geeup: Simple CLI for Earth Engine Uploads
 [![Hits-of-Code](https://hitsofcode.com/github/samapriya/geeup?branch=master)](https://hitsofcode.com/github/samapriya/geeup?branch=master)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7518782.svg)](https://doi.org/10.5281/zenodo.7518782)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7606098.svg)](https://doi.org/10.5281/zenodo.7606098)
 [![PyPI version](https://badge.fury.io/py/geeup.svg)](https://badge.fury.io/py/geeup)
@@ -22,4 +22,4 @@ [![Downloads](https://pepy.tech/badge/geeup/month)](https://pepy.tech/project/geeup)
 ```
-Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.5.9).
-Zenodo. https://doi.org/10.5281/zenodo.7518782
+Samapriya Roy. (2023). samapriya/geeup: geeup: Simple CLI for Earth Engine Uploads (0.6.2).
+Zenodo. https://doi.org/10.5281/zenodo.7606098
 ```
@@ -344,2 +344,7 @@
 
+### 0.6.2
+- Removed call to shell
+- Now prints status of task at task creation
+- Overwrite option for both images and tables
+
 ### 0.6.1
@@ -346,0 +351,0 @@ - Removed dependency on pipwin uses pipgeo instead

setup.py

@@ -18,3 +18,3 @@ import os
     name="geeup",
-    version="0.6.1",
+    version="0.6.2",
     packages=find_packages(),
@@ -21,0 +21,0 @@ url="https://github.com/samapriya/geeup",

Alert delta unavailable

Currently unable to show alert delta for PyPI packages.

Worsened metrics

Total package byte prevSize

152540

-0.16%

Lines of code

1541

-0.9%