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: Optimize the detection of whether a package is installed. #610

Merged
merged 2 commits into from
Apr 18, 2024
Merged

refactor: Optimize the detection of whether a package is installed. #610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7565ae9
refactor: Optimize the detection of whether a package is installed.
zen-xu Apr 18, 2024
1cae814
Merge branch 'main' into detect-pkg
wangxiaoying Apr 18, 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
44 changes: 16 additions & 28 deletions connectorx-python/connectorx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from __future__ import annotations

from typing import Any, Literal, TYPE_CHECKING, overload

import importlib
from importlib.metadata import version

from typing import Any, Literal, TYPE_CHECKING, overload

from .connectorx import (
read_sql as _read_sql,
partition_sql as _partition_sql,
Expand Down Expand Up @@ -311,10 +313,7 @@ def read_sql(
if return_type == "pandas":
df = df.to_pandas(date_as_object=False, split_blocks=False)
if return_type == "polars":
try:
import polars as pl
except ModuleNotFoundError:
raise ValueError("You need to install polars first")
pl = try_import_module("polars")

try:
# api change for polars >= 0.8.*
Expand Down Expand Up @@ -350,10 +349,7 @@ def read_sql(
conn, protocol = rewrite_conn(conn, protocol)

if return_type in {"modin", "dask", "pandas"}:
try:
import pandas
except ModuleNotFoundError:
raise ValueError("You need to install pandas first")
try_import_module("pandas")

result = _read_sql(
conn,
Expand All @@ -368,25 +364,14 @@ def read_sql(
df.set_index(index_col, inplace=True)

if return_type == "modin":
try:
import modin.pandas as mpd
except ModuleNotFoundError:
raise ValueError("You need to install modin first")

mpd = try_import_module("modin.pandas")
df = mpd.DataFrame(df)
elif return_type == "dask":
try:
import dask.dataframe as dd
except ModuleNotFoundError:
raise ValueError("You need to install dask first")

dd = try_import_module("dask.dataframe")
df = dd.from_pandas(df, npartitions=1)

elif return_type in {"arrow", "arrow2", "polars", "polars2"}:
try:
import pyarrow
except ModuleNotFoundError:
raise ValueError("You need to install pyarrow first")
try_import_module("pyarrow")

result = _read_sql(
conn,
Expand All @@ -397,11 +382,7 @@ def read_sql(
)
df = reconstruct_arrow(result)
if return_type in {"polars", "polars2"}:
try:
import polars as pl
except ModuleNotFoundError:
raise ValueError("You need to install polars first")

pl = try_import_module("polars")
try:
df = pl.DataFrame.from_arrow(df)
except AttributeError:
Expand Down Expand Up @@ -488,3 +469,10 @@ def remove_ending_semicolon(query: str) -> str:
if query.endswith(";"):
query = query[:-1]
return query


def try_import_module(name: str):
try:
return importlib.import_module(name)
except ModuleNotFoundError:
raise ValueError(f"You need to install {name.split('.')[0]} first")
Loading