Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: come back top a monolithic file structure #321

Merged
merged 2 commits into from
Oct 8, 2024
Merged

refactor: come back top a monolithic file structure #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
928504a
refactor: come back top a monolithic file structure
12rambau Oct 8, 2024
b2dac78
Merge branch 'main' into structure
12rambau Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions geetools/Array/__init__.py → geetools/Array.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_int, ee_number
from .accessors import register_class_accessor
from .types import ee_int, ee_number

# hack to have the generated Array class available
# it might create issues in the future with libs that have exotic init methods
Expand Down
4 changes: 2 additions & 2 deletions geetools/Asset/__init__.py → geetools/Asset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import ee
from anyascii import anyascii

from geetools.accessors import _register_extention
from geetools.types import pathlike
from .accessors import _register_extention
from .types import pathlike


@_register_extention(ee)
Expand Down
2 changes: 1 addition & 1 deletion geetools/Authenticate/__init__.py → geetools/Authenticate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import ee

from geetools.accessors import register_function_accessor
from .accessors import register_function_accessor


@register_function_accessor(ee.Authenticate, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/ComputedObject/__init__.py → geetools/ComputedObject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import ee

from geetools.accessors import _register_extention
from geetools.types import pathlike
from .accessors import _register_extention
from .types import pathlike


# -- types management ----------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion geetools/Date/__init__.py → geetools/Date.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import ee

from geetools.accessors import register_class_accessor
from .accessors import register_class_accessor

EE_EPOCH = datetime(1970, 1, 1, 0, 0, 0)

Expand Down
4 changes: 2 additions & 2 deletions geetools/DateRange/__init__.py → geetools/DateRange.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_int
from .accessors import register_class_accessor
from .types import ee_int


@register_class_accessor(ee.DateRange, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/Dictionary/__init__.py → geetools/Dictionary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_list
from .accessors import register_class_accessor
from .types import ee_list


@register_class_accessor(ee.Dictionary, "geetools")
Expand Down
16 changes: 8 additions & 8 deletions geetools/batch/Export/__init__.py → geetools/Export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.batch import utils
from .accessors import register_class_accessor
from .utils import format_asset_id, format_description


@register_class_accessor(ee.batch.Export, "geetools")
Expand Down Expand Up @@ -85,8 +85,8 @@ def toAsset(

# override the parameters related to the image itself
kwargs["image"] = locImage
kwargs["description"] = utils.format_description(f"{desc}_{loc_id}")
kwargs["assetId"] = (aid / utils.format_asset_id(loc_id)).as_posix()
kwargs["description"] = format_description(f"{desc}_{loc_id}")
kwargs["assetId"] = (aid / format_asset_id(loc_id)).as_posix()

# create the task
task_list.append(ee.batch.Export.image.toAsset(**kwargs))
Expand Down Expand Up @@ -149,8 +149,8 @@ def toDrive(
# override the parameters related to the image itself
# the folder will be created by the first task
kwargs["image"] = locImage
kwargs["folder"] = utils.format_asset_id(f"{fid}")
kwargs["description"] = utils.format_description(f"{desc}_{loc_id}")
kwargs["folder"] = format_asset_id(f"{fid}")
kwargs["description"] = format_description(f"{desc}_{loc_id}")

# create the task
task_list.append(ee.batch.Export.image.toDrive(**kwargs))
Expand Down Expand Up @@ -213,8 +213,8 @@ def toCloudStorage(
# override the parameters related to the image itself
# the folder will be created by the first task
kwargs["image"] = locImage
kwargs["fileNamePrefix"] = utils.format_asset_id(f"{fid}") + "/"
kwargs["description"] = utils.format_description(f"{desc}_{loc_id}")
kwargs["fileNamePrefix"] = format_asset_id(f"{fid}") + "/"
kwargs["description"] = format_description(f"{desc}_{loc_id}")

# create the task
task_list.append(ee.batch.Export.image.toCloudStorage(**kwargs))
Expand Down
4 changes: 2 additions & 2 deletions geetools/Feature/__init__.py → geetools/Feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_list
from .accessors import register_class_accessor
from .types import ee_list


@register_class_accessor(ee.Feature, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/FeatureCollection/__init__.py → geetools/FeatureCollection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from matplotlib.axes import Axes
from matplotlib.colors import to_rgba

from geetools.accessors import register_class_accessor
from geetools.types import ee_int, ee_list, ee_str
from .accessors import register_class_accessor
from .types import ee_int, ee_list, ee_str


@register_class_accessor(ee.FeatureCollection, "geetools")
Expand Down
2 changes: 1 addition & 1 deletion geetools/Filter/__init__.py → geetools/Filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import ee

from geetools.accessors import register_class_accessor
from .accessors import register_class_accessor


@register_class_accessor(ee.Filter, "geetools")
Expand Down
2 changes: 1 addition & 1 deletion geetools/Geometry/__init__.py → geetools/Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import ee

from geetools.accessors import register_class_accessor
from .accessors import register_class_accessor


@register_class_accessor(ee.Geometry, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/Image/__init__.py → geetools/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from pyproj import CRS, Transformer
from xee.ext import REQUEST_BYTE_LIMIT

from geetools.accessors import register_class_accessor
from geetools.types import (
from .accessors import register_class_accessor
from .types import (
ee_dict,
ee_geomlike,
ee_int,
Expand Down
0 geetools/ImageCollection/__init__.py → geetools/ImageCollection.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion geetools/Initialize/__init__.py → geetools/Initialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import ee
from google.oauth2.credentials import Credentials

from geetools.accessors import register_function_accessor
from .accessors import register_function_accessor

_project_id: Optional[str] = None
"The project Id used by the current user."
Expand Down
4 changes: 2 additions & 2 deletions geetools/Join/__init__.py → geetools/Join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_str
from .accessors import register_class_accessor
from .types import ee_str


@register_class_accessor(ee.Join, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/List/__init__.py → geetools/List.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_dict, ee_int, ee_list, ee_str
from .accessors import register_class_accessor
from .types import ee_dict, ee_int, ee_list, ee_str


@register_class_accessor(ee.List, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/Number/__init__.py → geetools/Number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_int
from .accessors import register_class_accessor
from .types import ee_int


@register_class_accessor(ee.Number, "geetools")
Expand Down
4 changes: 2 additions & 2 deletions geetools/String/__init__.py → geetools/String.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import ee

from geetools.accessors import register_class_accessor
from geetools.types import ee_dict, ee_str
from .accessors import register_class_accessor
from .types import ee_dict, ee_str


@register_class_accessor(ee.String, "geetools")
Expand Down
2 changes: 1 addition & 1 deletion geetools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from .Authenticate import AuthenticateAccessor
from .Array import ArrayAccessor
from .DateRange import DateRangeAccessor
from .batch.Export import ExportAccessor
from .Export import ExportAccessor


__title__ = "geetools"
Expand Down
0 geetools/batch/utils.py → geetools/utils.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/test_batch/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test the utils module."""

from geetools.batch import utils
from geetools import utils


class TestFormatDescription:
Expand Down