Skip to content

Promote generic utils/constants from gigl.src.common to gigl.common #705

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

Draft
kmontemayor2-sc wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Promote generic utils/constants from gigl.src.common to gigl.common #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/MAG240M/preprocessor_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
query_template_reindex_author_writes_paper_table,
)
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.env.pipelines_config import get_resource_config
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, EdgeUsageType, NodeType, Relation
from gigl.src.common.types.pb_wrappers.gigl_resource_config import (
GiglResourceConfigWrapper,
)
from gigl.src.common.utils.bq import BqUtils
from gigl.src.data_preprocessor.data_preprocessor import DataPreprocessorConfig
from gigl.src.data_preprocessor.lib.data_preprocessor_config import (
DataPreprocessorConfig,
Expand Down
2 changes: 1 addition & 1 deletion examples/MAG240M/preprocessor_config_heterogeneous.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
from examples.MAG240M.common import NUM_PAPER_FEATURES
from examples.MAG240M.queries import query_template_compute_average_features
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.env.pipelines_config import get_resource_config
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, EdgeUsageType, NodeType, Relation
from gigl.src.common.types.pb_wrappers.gigl_resource_config import (
GiglResourceConfigWrapper,
)
from gigl.src.common.utils.bq import BqUtils
from gigl.src.data_preprocessor.lib.data_preprocessor_config import (
DataPreprocessorConfig,
build_ingestion_feature_spec_fn,
Expand Down
2 changes: 1 addition & 1 deletion examples/id_embeddings/gowalla_data_preprocessor_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
from google.cloud.bigquery.job import WriteDisposition

from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.env.pipelines_config import get_resource_config
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, EdgeUsageType, NodeType, Relation
from gigl.src.common.types.pb_wrappers.gigl_resource_config import (
GiglResourceConfigWrapper,
)
from gigl.src.common.utils.bq import BqUtils
from gigl.src.data_preprocessor.lib.data_preprocessor_config import (
DataPreprocessorConfig,
build_ingestion_feature_spec_fn,
Expand Down
4 changes: 2 additions & 2 deletions examples/link_prediction/graph_store/heterogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@
from gigl.common import GcsUri, Uri, UriFactory
from gigl.common.data.export import EmbeddingExporter, load_embeddings_to_bigquery
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.common.utils.gcs import GcsUtils
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed.graph_store import (
GraphStoreInfo,
RemoteDistDataset,
Expand All @@ -110,8 +112,6 @@
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, NodeType
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.bq import BqUtils
from gigl.src.common.utils.model import load_state_dict_from_uri
from gigl.src.inference.lib.assets import InferenceAssets
from gigl.utils.sampling import parse_fanout

Expand Down
2 changes: 1 addition & 1 deletion examples/link_prediction/graph_store/heterogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
from examples.link_prediction.models import init_example_gigl_heterogeneous_model
from gigl.common import Uri, UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.common.utils.torch_training import is_distributed_available_and_initialized
from gigl.distributed import DistABLPLoader
from gigl.distributed.distributed_neighborloader import DistNeighborLoader
Expand All @@ -113,7 +114,6 @@
EvalMetricType,
)
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.utils.iterator import InfiniteIterator
from gigl.utils.sampling import parse_fanout

Expand Down
4 changes: 2 additions & 2 deletions examples/link_prediction/graph_store/homogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@
from gigl.common import GcsUri, Uri, UriFactory
from gigl.common.data.export import EmbeddingExporter, load_embeddings_to_bigquery
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.common.utils.gcs import GcsUtils
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed.graph_store import (
GraphStoreInfo,
RemoteDistDataset,
Expand All @@ -110,8 +112,6 @@
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, NodeType
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.bq import BqUtils
from gigl.src.common.utils.model import load_state_dict_from_uri
from gigl.src.inference.lib.assets import InferenceAssets
from gigl.utils.sampling import parse_fanout

Expand Down
2 changes: 1 addition & 1 deletion examples/link_prediction/graph_store/homogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
from examples.link_prediction.models import init_example_gigl_homogeneous_model
from gigl.common import Uri, UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.common.utils.torch_training import is_distributed_available_and_initialized
from gigl.distributed import DistABLPLoader
from gigl.distributed.distributed_neighborloader import DistNeighborLoader
Expand All @@ -157,7 +158,6 @@
EvalMetricType,
)
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.utils.iterator import InfiniteIterator
from gigl.utils.sampling import parse_fanout

Expand Down
4 changes: 2 additions & 2 deletions examples/link_prediction/heterogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
from gigl.common import GcsUri, Uri, UriFactory
from gigl.common.data.export import EmbeddingExporter, load_embeddings_to_bigquery
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.common.utils.gcs import GcsUtils
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed import DistDataset, build_dataset_from_task_config_uri
from gigl.nn import LinkPredictionGNN
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, NodeType
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.bq import BqUtils
from gigl.src.common.utils.model import load_state_dict_from_uri
from gigl.src.inference.lib.assets import InferenceAssets
from gigl.utils.sampling import parse_fanout

Expand Down
2 changes: 1 addition & 1 deletion examples/link_prediction/heterogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
from examples.link_prediction.models import init_example_gigl_heterogeneous_model
from gigl.common import Uri, UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.common.utils.torch_training import is_distributed_available_and_initialized
from gigl.distributed import (
DistABLPLoader,
Expand All @@ -62,7 +63,6 @@
EvalMetricType,
)
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.utils.iterator import InfiniteIterator
from gigl.utils.sampling import parse_fanout

Expand Down
4 changes: 2 additions & 2 deletions examples/link_prediction/homogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
from gigl.common import GcsUri, Uri, UriFactory
from gigl.common.data.export import EmbeddingExporter, load_embeddings_to_bigquery
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.common.utils.gcs import GcsUtils
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed import DistDataset, build_dataset_from_task_config_uri
from gigl.nn import LinkPredictionGNN
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, NodeType
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.bq import BqUtils
from gigl.src.common.utils.model import load_state_dict_from_uri
from gigl.src.inference.lib.assets import InferenceAssets
from gigl.utils.sampling import parse_fanout

Expand Down
2 changes: 1 addition & 1 deletion examples/link_prediction/homogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from examples.link_prediction.models import init_example_gigl_homogeneous_model
from gigl.common import Uri, UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.common.utils.torch_training import is_distributed_available_and_initialized
from gigl.distributed import (
DistABLPLoader,
Expand All @@ -57,7 +58,6 @@
EvalMetricType,
)
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.types.graph import to_homogeneous
from gigl.utils.iterator import InfiniteIterator
from gigl.utils.sampling import parse_fanout
Expand Down
4 changes: 2 additions & 2 deletions examples/node_classification/homogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
from gigl.common import GcsUri, Uri, UriFactory
from gigl.common.data.export import PredictionExporter, load_predictions_to_bigquery
from gigl.common.logger import Logger
from gigl.common.utils.bq import BqUtils
from gigl.common.utils.gcs import GcsUtils
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed import DistDataset, build_dataset_from_task_config_uri
from gigl.src.common.types import AppliedTaskIdentifier
from gigl.src.common.types.graph_data import EdgeType, NodeType
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.bq import BqUtils
from gigl.src.common.utils.model import load_state_dict_from_uri
from gigl.src.inference.lib.assets import InferenceAssets
from gigl.utils.sampling import parse_fanout

Expand Down
2 changes: 1 addition & 1 deletion examples/node_classification/homogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
)
from gigl.common import Uri, UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.common.utils.torch_training import is_distributed_available_and_initialized
from gigl.distributed import DistDataset, build_dataset_from_task_config_uri
from gigl.distributed.distributed_neighborloader import DistNeighborLoader
Expand All @@ -62,7 +63,6 @@
EvalMetricType,
)
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri, save_state_dict
from gigl.types.graph import to_homogeneous
from gigl.utils.iterator import InfiniteIterator
from gigl.utils.sampling import parse_fanout
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial/KDD_2025/heterogeneous_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
from gigl.common import Uri, UriFactory
from gigl.common.data.export import EmbeddingExporter
from gigl.common.logger import Logger
from gigl.common.utils.model import load_state_dict_from_uri
from gigl.distributed import (
DistDataset,
DistNeighborLoader,
build_dataset_from_task_config_uri,
)
from gigl.distributed.utils import get_free_port
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import load_state_dict_from_uri

logger = Logger()

Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial/KDD_2025/heterogeneous_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from examples.tutorial.KDD_2025.utils import LOCAL_SAVED_MODEL_URI, init_model
from gigl.common import UriFactory
from gigl.common.logger import Logger
from gigl.common.utils.model import save_state_dict
from gigl.distributed import (
DistABLPLoader,
DistDataset,
Expand All @@ -55,7 +56,6 @@
from gigl.distributed.utils import get_free_port
from gigl.src.common.types.graph_data import EdgeType, NodeType, Relation
from gigl.src.common.types.pb_wrappers.gbml_config import GbmlConfigPbWrapper
from gigl.src.common.utils.model import save_state_dict
from gigl.utils.iterator import InfiniteIterator

logger = Logger()
Expand Down
2 changes: 1 addition & 1 deletion gigl/analytics/graph_validation/bq_graph_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from google.cloud.bigquery.table import RowIterator

from gigl.common.logger import Logger
from gigl.src.common.utils.bq import BqUtils
from gigl.common.utils.bq import BqUtils

logger = Logger()

Expand Down
8 changes: 8 additions & 0 deletions gigl/common/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,11 @@ def parse_makefile_vars(makefile_path: Path) -> dict[str, str]:
"DEFAULT_GIGL_RELEASE_KFP_PIPELINE_PATH"
]
# ===============================================================================================


# Datetime format constants
DEFAULT_DATETIME_FORMAT: Final[str] = "%Y-%m-%d--%H-%M-%S-%Z"
DEFAULT_DATE_FORMAT: Final[str] = "%Y%m%d"
NODASH_DATE_FMT: Final[str] = "%Y%m%d"
NODASH_DATETIME_FORMAT: Final[str] = "%Y%m%d%H%M%S"
DASH_DATE_FMT: Final[str] = "%Y-%m-%d"
2 changes: 1 addition & 1 deletion gigl/common/data/dataloaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from gigl.common import Uri
from gigl.common.logger import Logger
from gigl.common.utils.decorator import tf_on_cpu
from gigl.common.utils.file_loader import FileLoader
from gigl.src.common.types.features import FeatureTypes
from gigl.src.common.utils.file_loader import FileLoader
from gigl.src.data_preprocessor.lib.types import FeatureSpecDict

logger = Logger()
Expand Down
2 changes: 1 addition & 1 deletion gigl/common/data/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

from gigl.common import GcsUri, LocalUri, Uri
from gigl.common.logger import Logger
from gigl.common.utils.file_loader import FileLoader
from gigl.common.utils.retry import retry
from gigl.src.common.utils.file_loader import FileLoader

logger = Logger()

Expand Down
Loading