Skip to content

dir_path_change #38

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

Merged
Yun024 merged 2 commits into from
Mar 16, 2025
Merged

dir_path_change #38

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
7ff516d
dir_path_change
Yun024 Mar 16, 2025
2dec298
Automated format fixes
actions-user Mar 16, 2025
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
15 changes: 7 additions & 8 deletions airflow/dags/scripts/ELT_artist_info_globalTop50.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ def transformation():
)

# 데이터 읽고 중복 제거
artist_info_df = extract(
"spotify_artist_info",
artist_info_schema).dropDuplicates(
["artist_id"])
global_top50_df = extract("spotify_crawling_data", global_top50_schema)
artist_info_df = extract("artist_info", artist_info_schema).dropDuplicates(
["artist_id"]
)
global_top50_df = extract("crawling_data", global_top50_schema)

global_top50_df = global_top50_df.withColumn(
"artist_id", explode("artist_id"))
Expand All @@ -86,12 +85,12 @@ def extract(file_name, schema):
spark = create_spark_session("artist_global_table")

df = spark.read.csv(
f"s3a://{BUCKET_NAME}/{OBJECT_NAME}/{file_name}_{TODAY}.csv",
f"s3a://{BUCKET_NAME}/{OBJECT_NAME}/{file_name}/spotify_{file_name}_{TODAY}.csv",
header=True,
schema=schema,
)

if file_name == "spotify_crawling_data":
if file_name == "crawling_data":
df = (
df.withColumn(
"artist", split(
Expand All @@ -106,7 +105,7 @@ def extract(file_name, schema):
col("artist").isNull(), lit(
[""])).otherwise(
col("artist")), ))
if file_name == "spotify_artist_info":
if file_name == "artist_info":
df = df.withColumn(
"artist_genre", regexp_replace(df["artist_genre"], "[\\[\\]']", "")
) # 불필요한 문자 제거
Expand Down
16 changes: 8 additions & 8 deletions airflow/dags/scripts/ELT_artist_info_top10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ def transformation():

# 데이터 읽어오고 중복 제거
artist_top10_df = extract(
"spotify_artist_top10", artist_top10_schema
).dropDuplicates(["song_id"])
artist_info_df = extract(
"spotify_artist_info",
artist_info_schema).dropDuplicates(
["artist_id"])
"artist_top10",
artist_top10_schema).dropDuplicates(
["song_id"])
artist_info_df = extract("artist_info", artist_info_schema).dropDuplicates(
["artist_id"]
)

artist_info_top10_df = artist_info_df.join(
artist_top10_df, on="artist_id", how="outer"
Expand Down Expand Up @@ -111,12 +111,12 @@ def extract(file_name, schema):

spark = create_spark_session("artist_top10_table")
df = spark.read.csv(
f"s3a://{BUCKET_NAME}/{OBJECT_NAME}/{file_name}_{TODAY}.csv",
f"s3a://{BUCKET_NAME}/{OBJECT_NAME}/{file_name}/spotify_{file_name}_{TODAY}.csv",
header=True,
schema=schema,
)

if file_name == "spotify_artist_info":
if file_name == "artist_info":
df = df.withColumn(
"artist_genre", regexp_replace(df["artist_genre"], "[\\[\\]']", "")
) # 불필요한 문자 제거
Expand Down
3 changes: 2 additions & 1 deletion airflow/dags/scripts/crawling_spotify_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ def make_dataframe():
# 크롤링 데이터를 csv로 저장
def save_as_csv_file(df, logical_date):

dir_path = "crawling_data"
file_path = f"data/spotify_crawling_data_{TODAY}.csv"

df.to_csv(file_path, encoding="utf-8", mode="w", header=True, index=False)
load_s3_bucket(f"spotify_crawling_data_{logical_date}.csv")
load_s3_bucket(dir_path, f"spotify_crawling_data_{logical_date}.csv")


def data_crawling(logical_date):
Expand Down
4 changes: 2 additions & 2 deletions airflow/dags/scripts/load_spotify_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
from airflow.providers.amazon.aws.hooks.s3 import S3Hook


def load_s3_bucket(file_name):
def load_s3_bucket(dir_name, file_name):

s3_hook = S3Hook(aws_conn_id="AWS_S3")
s3_bucket = "de5-s4tify"
s3_key = f"raw_data/{file_name}"
s3_key = f"raw_data/{dir_name}/{file_name}"

local_file_path = f"data/{file_name}"

Expand Down
6 changes: 4 additions & 2 deletions airflow/dags/scripts/request_spotify_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def get_arti_top10(logical_date, **kwargs):

task_instance = kwargs["ti"]
arti_top10_list = []
dir_name = "artist_top10"
object_name = f"spotify_artist_top10_{logical_date}.csv"

# csv 파일 읽어오기
Expand Down Expand Up @@ -65,7 +66,7 @@ def get_arti_top10(logical_date, **kwargs):
encoding="utf-8-sig",
index=False)
try:
load_s3_bucket(object_name)
load_s3_bucket(dir_name, object_name)
os.remove(f"data/{object_name}")
except Exception as e:
print(f"error: {e}")
Expand All @@ -76,6 +77,7 @@ def get_artist_info(logical_date, **kwargs):

task_instance = kwargs["ti"]
artist_info_list = []
dir_name = "artist_info"
object_name = f"spotify_artist_info_{logical_date}.csv"

# csv 파일 읽어오기
Expand Down Expand Up @@ -109,7 +111,7 @@ def get_artist_info(logical_date, **kwargs):
encoding="utf-8-sig",
index=False)
try:
load_s3_bucket(object_name)
load_s3_bucket(dir_name, object_name)
os.remove(f"data/{object_name}")
except Exception as e:
print(f"error: {e}")
Expand Down