RHEcosystemAppEng · itay1551 · Jul 20, 2025 · Jul 17, 2025
diff --git a/Containerfile b/Containerfile
@@ -9,9 +9,7 @@ RUN pip3 install uv
 RUN uv pip install -r pyproject.toml
 RUN dnf update -y
 
-COPY models/ models/
-COPY feature_repo/ feature_repo/
-COPY service/ service/
+COPY recsysapp/ recsysapp/
 # give premisssions 
 RUN chmod -R 777 . && ls -la
 

diff --git a/feature_repo/__pycache__/__init__.cpython-310.pyc b/feature_repo/__pycache__/__init__.cpython-310.pyc
diff --git a/feature_repo/__pycache__/__init__.cpython-311.pyc b/feature_repo/__pycache__/__init__.cpython-311.pyc
diff --git a/feature_repo/__pycache__/data_sources.cpython-310.pyc b/feature_repo/__pycache__/data_sources.cpython-310.pyc
diff --git a/feature_repo/__pycache__/entities.cpython-310.pyc b/feature_repo/__pycache__/entities.cpython-310.pyc
diff --git a/feature_repo/__pycache__/feature_services.cpython-311.pyc b/feature_repo/__pycache__/feature_services.cpython-311.pyc
diff --git a/feature_repo/__pycache__/feature_views.cpython-310.pyc b/feature_repo/__pycache__/feature_views.cpython-310.pyc
diff --git a/feature_repo/__pycache__/feature_views.cpython-311.pyc b/feature_repo/__pycache__/feature_views.cpython-311.pyc
diff --git a/models/__pycache__/data_util.cpython-311.pyc b/models/__pycache__/data_util.cpython-311.pyc
diff --git a/models/__pycache__/entity_tower.cpython-311.pyc b/models/__pycache__/entity_tower.cpython-311.pyc
diff --git a/models/__pycache__/train_two_tower.cpython-311.pyc b/models/__pycache__/train_two_tower.cpython-311.pyc
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,8 +31,8 @@ dev = [
 pythonpath = "."
 
 [build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
-[tool.setuptools]
-packages = ["models", "service", "generation", "feature_repo"]
+[tool.hatch.build.targets.wheel]
+packages = ["recsysapp"]
diff --git a/feature_repo/__init__.py → recsysapp/feature_repo/__init__.py b/feature_repo/__init__.py → recsysapp/feature_repo/__init__.py
diff --git a/feature_repo/data/amazon.csv → recsysapp/feature_repo/data/amazon.csv b/feature_repo/data/amazon.csv → recsysapp/feature_repo/data/amazon.csv
diff --git a/...re_repo/data/amazon_with_fixed_images.csv → ...re_repo/data/amazon_with_fixed_images.csv b/...re_repo/data/amazon_with_fixed_images.csv → ...re_repo/data/amazon_with_fixed_images.csv
diff --git a/feature_repo/data/dummy_item_embed.parquet → ...eature_repo/data/dummy_item_embed.parquet b/feature_repo/data/dummy_item_embed.parquet → ...eature_repo/data/dummy_item_embed.parquet
diff --git a/feature_repo/data/dummy_user_embed.parquet → ...eature_repo/data/dummy_user_embed.parquet b/feature_repo/data/dummy_user_embed.parquet → ...eature_repo/data/dummy_user_embed.parquet
diff --git a/feature_repo/data/generated_amazon.csv → ...pp/feature_repo/data/generated_amazon.csv b/feature_repo/data/generated_amazon.csv → ...pp/feature_repo/data/generated_amazon.csv
diff --git a/...o/data/interactions_item_user_ids.parquet → ...o/data/interactions_item_user_ids.parquet b/...o/data/interactions_item_user_ids.parquet → ...o/data/interactions_item_user_ids.parquet
diff --git a/...epo/data/item_clip_features_embed.parquet → ...epo/data/item_clip_features_embed.parquet b/...epo/data/item_clip_features_embed.parquet → ...epo/data/item_clip_features_embed.parquet
diff --git a/.../data/item_textual_features_embed.parquet → .../data/item_textual_features_embed.parquet b/.../data/item_textual_features_embed.parquet → .../data/item_textual_features_embed.parquet
diff --git a/.../data/recommendation_interactions.parquet → .../data/recommendation_interactions.parquet b/.../data/recommendation_interactions.parquet → .../data/recommendation_interactions.parquet
diff --git a/...re_repo/data/recommendation_items.parquet → ...re_repo/data/recommendation_items.parquet b/...re_repo/data/recommendation_items.parquet → ...re_repo/data/recommendation_items.parquet
diff --git a/...re_repo/data/recommendation_users.parquet → ...re_repo/data/recommendation_users.parquet b/...re_repo/data/recommendation_users.parquet → ...re_repo/data/recommendation_users.parquet
diff --git a/feature_repo/data/user_items.parquet → ...sapp/feature_repo/data/user_items.parquet b/feature_repo/data/user_items.parquet → ...sapp/feature_repo/data/user_items.parquet
diff --git a/feature_repo/data_sources.py → recsysapp/feature_repo/data_sources.py b/feature_repo/data_sources.py → recsysapp/feature_repo/data_sources.py
@@ -3,7 +3,6 @@
 from feast import FileSource, PushSource
 from feast.data_format import ParquetFormat
 
-feast_path = "feature_repo"
 data_path = "data"
 
 users_source = FileSource(

diff --git a/feature_repo/entities.py → recsysapp/feature_repo/entities.py b/feature_repo/entities.py → recsysapp/feature_repo/entities.py
diff --git a/feature_repo/feature_services.py → recsysapp/feature_repo/feature_services.py b/feature_repo/feature_services.py → recsysapp/feature_repo/feature_services.py
diff --git a/feature_repo/feature_store.yaml → recsysapp/feature_repo/feature_store.yaml b/feature_repo/feature_store.yaml → recsysapp/feature_repo/feature_store.yaml
diff --git a/feature_repo/feature_views.py → recsysapp/feature_repo/feature_views.py b/feature_repo/feature_views.py → recsysapp/feature_repo/feature_views.py
diff --git a/generation/amazon_with_fixed_images.py → ...pp/generation/amazon_with_fixed_images.py b/generation/amazon_with_fixed_images.py → ...pp/generation/amazon_with_fixed_images.py
diff --git a/...generated_images/item_AirFlow Maestro.png → ...generated_images/item_AirFlow Maestro.png b/...generated_images/item_AirFlow Maestro.png → ...generated_images/item_AirFlow Maestro.png
diff --git a/...ata/generated_images/item_AquaPure RO.png → ...ata/generated_images/item_AquaPure RO.png b/...ata/generated_images/item_AquaPure RO.png → ...ata/generated_images/item_AquaPure RO.png
diff --git a/...data/generated_images/item_ArtPad Pro.png → ...data/generated_images/item_ArtPad Pro.png b/...data/generated_images/item_ArtPad Pro.png → ...data/generated_images/item_ArtPad Pro.png
diff --git a/...data/generated_images/item_ArtPen Pro.png → ...data/generated_images/item_ArtPen Pro.png b/...data/generated_images/item_ArtPen Pro.png → ...data/generated_images/item_ArtPen Pro.png
diff --git a/...a/generated_images/item_BassBoost Pro.png → ...a/generated_images/item_BassBoost Pro.png b/...a/generated_images/item_BassBoost Pro.png → ...a/generated_images/item_BassBoost Pro.png
diff --git a/...ta/generated_images/item_BassLife TWS.png → ...ta/generated_images/item_BassLife TWS.png b/...ta/generated_images/item_BassLife TWS.png → ...ta/generated_images/item_BassLife TWS.png
diff --git a/...nerated_images/item_BlendMaster Stick.png → ...nerated_images/item_BlendMaster Stick.png b/...nerated_images/item_BlendMaster Stick.png → ...nerated_images/item_BlendMaster Stick.png
diff --git a/...erated_images/item_BlendPro Immersion.png → ...erated_images/item_BlendPro Immersion.png b/...erated_images/item_BlendPro Immersion.png → ...erated_images/item_BlendPro Immersion.png
diff --git a/...enerated_images/item_BreakfastDuo Set.png → ...enerated_images/item_BreakfastDuo Set.png b/...enerated_images/item_BreakfastDuo Set.png → ...enerated_images/item_BreakfastDuo Set.png
diff --git a/...ata/generated_images/item_CableMax 8K.png → ...ata/generated_images/item_CableMax 8K.png b/...ata/generated_images/item_CableMax 8K.png → ...ata/generated_images/item_CableMax 8K.png
diff --git a/...data/generated_images/item_CarVac Pro.png → ...data/generated_images/item_CarVac Pro.png b/...data/generated_images/item_CarVac Pro.png → ...data/generated_images/item_CarVac Pro.png
diff --git a/...generated_images/item_ChopMaster Mini.png → ...generated_images/item_ChopMaster Mini.png b/...generated_images/item_ChopMaster Mini.png → ...generated_images/item_ChopMaster Mini.png
diff --git a/...enerated_images/item_CineView 55 QLED.png → ...enerated_images/item_CineView 55 QLED.png b/...enerated_images/item_CineView 55 QLED.png → ...enerated_images/item_CineView 55 QLED.png
diff --git a/...enerated_images/item_ComfortHeat Plus.png → ...enerated_images/item_ComfortHeat Plus.png b/...enerated_images/item_ComfortHeat Plus.png → ...enerated_images/item_ComfortHeat Plus.png
diff --git a/...rated_images/item_CookSmart Induction.png → ...rated_images/item_CookSmart Induction.png b/...rated_images/item_CookSmart Induction.png → ...rated_images/item_CookSmart Induction.png
diff --git a/...enerated_images/item_CrystalClear Max.png → ...enerated_images/item_CrystalClear Max.png b/...enerated_images/item_CrystalClear Max.png → ...enerated_images/item_CrystalClear Max.png
diff --git a/...a/generated_images/item_DataVault 256.png → ...a/generated_images/item_DataVault 256.png b/...a/generated_images/item_DataVault 256.png → ...a/generated_images/item_DataVault 256.png
diff --git a/...a/generated_images/item_DeskMount Pro.png → ...a/generated_images/item_DeskMount Pro.png b/...a/generated_images/item_DeskMount Pro.png → ...a/generated_images/item_DeskMount Pro.png
diff --git a/...ta/generated_images/item_DigiPen Plus.png → ...ta/generated_images/item_DigiPen Plus.png b/...ta/generated_images/item_DigiPen Plus.png → ...ta/generated_images/item_DigiPen Plus.png
diff --git a/...nerated_images/item_DigitalCanvas Pro.png → ...nerated_images/item_DigitalCanvas Pro.png b/...nerated_images/item_DigitalCanvas Pro.png → ...nerated_images/item_DigitalCanvas Pro.png
diff --git a/.../generated_images/item_DustBuster Pro.png → .../generated_images/item_DustBuster Pro.png b/.../generated_images/item_DustBuster Pro.png → .../generated_images/item_DustBuster Pro.png
diff --git a/...ata/generated_images/item_EggMaster 6.png → ...ata/generated_images/item_EggMaster 6.png b/...ata/generated_images/item_EggMaster 6.png → ...ata/generated_images/item_EggMaster 6.png
diff --git a/.../generated_images/item_EggPerfect Pro.png → .../generated_images/item_EggPerfect Pro.png b/.../generated_images/item_EggPerfect Pro.png → .../generated_images/item_EggPerfect Pro.png
diff --git a/...a/generated_images/item_ErgoMouse Pro.png → ...a/generated_images/item_ErgoMouse Pro.png b/...a/generated_images/item_ErgoMouse Pro.png → ...a/generated_images/item_ErgoMouse Pro.png
diff --git a/...a/generated_images/item_FilterPro Set.png → ...a/generated_images/item_FilterPro Set.png b/...a/generated_images/item_FilterPro Set.png → ...a/generated_images/item_FilterPro Set.png
diff --git a/...nerated_images/item_FilterSet Premium.png → ...nerated_images/item_FilterSet Premium.png b/...nerated_images/item_FilterSet Premium.png → ...nerated_images/item_FilterSet Premium.png
diff --git a/...ed_images/item_Fitness Smartwatch Pro.png → ...ed_images/item_Fitness Smartwatch Pro.png b/...ed_images/item_Fitness Smartwatch Pro.png → ...ed_images/item_Fitness Smartwatch Pro.png
diff --git a/.../generated_images/item_FlashHeat Plus.png → .../generated_images/item_FlashHeat Plus.png b/.../generated_images/item_FlashHeat Plus.png → .../generated_images/item_FlashHeat Plus.png
diff --git a/...a/generated_images/item_FlexMount Pro.png → ...a/generated_images/item_FlexMount Pro.png b/...a/generated_images/item_FlexMount Pro.png → ...a/generated_images/item_FlexMount Pro.png
diff --git a/...ata/generated_images/item_FoldAway XL.png → ...ata/generated_images/item_FoldAway XL.png b/...ata/generated_images/item_FoldAway XL.png → ...ata/generated_images/item_FoldAway XL.png
diff --git a/...enerated_images/item_FreshKeeper Plus.png → ...enerated_images/item_FreshKeeper Plus.png b/...enerated_images/item_FreshKeeper Plus.png → ...enerated_images/item_FreshKeeper Plus.png
diff --git a/...data/generated_images/item_GaNPro 100.png → ...data/generated_images/item_GaNPro 100.png b/...data/generated_images/item_GaNPro 100.png → ...data/generated_images/item_GaNPro 100.png
diff --git a/...enerated_images/item_Galaxy X23 Ultra.png → ...enerated_images/item_Galaxy X23 Ultra.png b/...enerated_images/item_Galaxy X23 Ultra.png → ...enerated_images/item_Galaxy X23 Ultra.png
diff --git a/...ata/generated_images/item_GamingPro X.png → ...ata/generated_images/item_GamingPro X.png b/...ata/generated_images/item_GamingPro X.png → ...ata/generated_images/item_GamingPro X.png
diff --git a/...ata/generated_images/item_GlidePro XL.png → ...ata/generated_images/item_GlidePro XL.png b/...ata/generated_images/item_GlidePro XL.png → ...ata/generated_images/item_GlidePro XL.png
diff --git a/...a/generated_images/item_GrillMaster 4.png → ...a/generated_images/item_GrillMaster 4.png b/...a/generated_images/item_GrillMaster 4.png → ...a/generated_images/item_GrillMaster 4.png
diff --git a/...nerated_images/item_HealthTrack Elite.png → ...nerated_images/item_HealthTrack Elite.png b/...nerated_images/item_HealthTrack Elite.png → ...nerated_images/item_HealthTrack Elite.png
diff --git a/...a/generated_images/item_HeatFlow 2000.png → ...a/generated_images/item_HeatFlow 2000.png b/...a/generated_images/item_HeatFlow 2000.png → ...a/generated_images/item_HeatFlow 2000.png
diff --git a/.../generated_images/item_HeatQuick 1500.png → .../generated_images/item_HeatQuick 1500.png b/.../generated_images/item_HeatQuick 1500.png → .../generated_images/item_HeatQuick 1500.png
diff --git a/...ata/generated_images/item_HomeNet Pro.png → ...ata/generated_images/item_HomeNet Pro.png b/...ata/generated_images/item_HomeNet Pro.png → ...ata/generated_images/item_HomeNet Pro.png
diff --git a/...generated_images/item_InstantHot 3000.png → ...generated_images/item_InstantHot 3000.png b/...generated_images/item_InstantHot 3000.png → ...generated_images/item_InstantHot 3000.png
diff --git a/...generated_images/item_IronMaster 2000.png → ...generated_images/item_IronMaster 2000.png b/...generated_images/item_IronMaster 2000.png → ...generated_images/item_IronMaster 2000.png
diff --git a/...ated_images/item_JuiceMaster Ultimate.png → ...ated_images/item_JuiceMaster Ultimate.png b/...ated_images/item_JuiceMaster Ultimate.png → ...ated_images/item_JuiceMaster Ultimate.png
diff --git a/...enerated_images/item_KitchenPro Scale.png → ...enerated_images/item_KitchenPro Scale.png b/...enerated_images/item_KitchenPro Scale.png → ...enerated_images/item_KitchenPro Scale.png
diff --git a/.../generated_images/item_MeshPro System.png → .../generated_images/item_MeshPro System.png b/.../generated_images/item_MeshPro System.png → .../generated_images/item_MeshPro System.png
diff --git a/...erated_images/item_MorningStart Combo.png → ...erated_images/item_MorningStart Combo.png b/...erated_images/item_MorningStart Combo.png → ...erated_images/item_MorningStart Combo.png
diff --git a/.../generated_images/item_NanoShield Max.png → .../generated_images/item_NanoShield Max.png b/.../generated_images/item_NanoShield Max.png → .../generated_images/item_NanoShield Max.png
diff --git a/...ata/generated_images/item_NetBoost AC.png → ...ata/generated_images/item_NetBoost AC.png b/...ata/generated_images/item_NetBoost AC.png → ...ata/generated_images/item_NetBoost AC.png
diff --git a/...generated_images/item_NetSpeed Pro X1.png → ...generated_images/item_NetSpeed Pro X1.png b/...generated_images/item_NetSpeed Pro X1.png → ...generated_images/item_NetSpeed Pro X1.png
diff --git a/...enerated_images/item_NutriExtract Pro.png → ...enerated_images/item_NutriExtract Pro.png b/...enerated_images/item_NutriExtract Pro.png → ...enerated_images/item_NutriExtract Pro.png
diff --git a/...rated_images/item_OfficeComfort Elite.png → ...rated_images/item_OfficeComfort Elite.png b/...rated_images/item_OfficeComfort Elite.png → ...rated_images/item_OfficeComfort Elite.png
diff --git a/...enerated_images/item_PerfectPress Pro.png → ...enerated_images/item_PerfectPress Pro.png b/...enerated_images/item_PerfectPress Pro.png → ...enerated_images/item_PerfectPress Pro.png
diff --git a/...erated_images/item_PowerBlend Pro 750.png → ...erated_images/item_PowerBlend Pro 750.png b/...erated_images/item_PowerBlend Pro 750.png → ...erated_images/item_PowerBlend Pro 750.png
diff --git a/...ta/generated_images/item_PowerCell AA.png → ...ta/generated_images/item_PowerCell AA.png b/...ta/generated_images/item_PowerCell AA.png → ...ta/generated_images/item_PowerCell AA.png
diff --git a/...generated_images/item_PowerCore 20000.png → ...generated_images/item_PowerCore 20000.png b/...generated_images/item_PowerCore 20000.png → ...generated_images/item_PowerCore 20000.png
diff --git a/...enerated_images/item_PreciseWeigh Pro.png → ...enerated_images/item_PreciseWeigh Pro.png b/...enerated_images/item_PreciseWeigh Pro.png → ...enerated_images/item_PreciseWeigh Pro.png
diff --git a/...generated_images/item_ProNote Premium.png → ...generated_images/item_ProNote Premium.png b/...generated_images/item_ProNote Premium.png → ...generated_images/item_ProNote Premium.png
diff --git a/.../generated_images/item_PureFlow Ultra.png → .../generated_images/item_PureFlow Ultra.png b/.../generated_images/item_PureFlow Ultra.png → .../generated_images/item_PureFlow Ultra.png
diff --git a/.../generated_images/item_QuickBoil 2000.png → .../generated_images/item_QuickBoil 2000.png b/.../generated_images/item_QuickBoil 2000.png → .../generated_images/item_QuickBoil 2000.png
diff --git a/...a/generated_images/item_QuickCharge C.png → ...a/generated_images/item_QuickCharge C.png b/...a/generated_images/item_QuickCharge C.png → ...a/generated_images/item_QuickCharge C.png
diff --git a/...generated_images/item_QuickChop Elite.png → ...generated_images/item_QuickChop Elite.png b/...generated_images/item_QuickChop Elite.png → ...generated_images/item_QuickChop Elite.png
diff --git a/...ta/generated_images/item_SafeGuard 15.png → ...ta/generated_images/item_SafeGuard 15.png b/...ta/generated_images/item_SafeGuard 15.png → ...ta/generated_images/item_SafeGuard 15.png
diff --git a/...generated_images/item_SecureVault Pro.png → ...generated_images/item_SecureVault Pro.png b/...generated_images/item_SecureVault Pro.png → ...generated_images/item_SecureVault Pro.png
diff --git a/...enerated_images/item_SeniorPhone Plus.png → ...enerated_images/item_SeniorPhone Plus.png b/...enerated_images/item_SeniorPhone Plus.png → ...enerated_images/item_SeniorPhone Plus.png
diff --git a/...nerated_images/item_ShieldGuard Ultra.png → ...nerated_images/item_ShieldGuard Ultra.png b/...nerated_images/item_ShieldGuard Ultra.png → ...nerated_images/item_ShieldGuard Ultra.png
diff --git a/.../generated_images/item_SimplePhone 2G.png → .../generated_images/item_SimplePhone 2G.png b/.../generated_images/item_SimplePhone 2G.png → .../generated_images/item_SimplePhone 2G.png
diff --git a/.../generated_images/item_SmartBreeze DC.png → .../generated_images/item_SmartBreeze DC.png b/.../generated_images/item_SmartBreeze DC.png → .../generated_images/item_SmartBreeze DC.png
diff --git a/.../generated_images/item_SmartControl X.png → .../generated_images/item_SmartControl X.png b/.../generated_images/item_SmartControl X.png → .../generated_images/item_SmartControl X.png
diff --git a/.../generated_images/item_SmartCook Flex.png → .../generated_images/item_SmartCook Flex.png b/.../generated_images/item_SmartCook Flex.png → .../generated_images/item_SmartCook Flex.png
diff --git a/...a/generated_images/item_SmartTemp 35L.png → ...a/generated_images/item_SmartTemp 35L.png b/...a/generated_images/item_SmartTemp 35L.png → ...a/generated_images/item_SmartTemp 35L.png
diff --git a/...enerated_images/item_SmartView 65 Neo.png → ...enerated_images/item_SmartView 65 Neo.png b/...enerated_images/item_SmartView 65 Neo.png → ...enerated_images/item_SmartView 65 Neo.png
diff --git a/...nerated_images/item_SmoothPress Elite.png → ...nerated_images/item_SmoothPress Elite.png b/...nerated_images/item_SmoothPress Elite.png → ...nerated_images/item_SmoothPress Elite.png
diff --git a/...ta/generated_images/item_SortMaster 3.png → ...ta/generated_images/item_SortMaster 3.png b/...ta/generated_images/item_SortMaster 3.png → ...ta/generated_images/item_SortMaster 3.png
diff --git a/...generated_images/item_SoundPods Elite.png → ...generated_images/item_SoundPods Elite.png b/...generated_images/item_SoundPods Elite.png → ...generated_images/item_SoundPods Elite.png
diff --git a/.../generated_images/item_SpeedMesh Trio.png → .../generated_images/item_SpeedMesh Trio.png b/.../generated_images/item_SpeedMesh Trio.png → .../generated_images/item_SpeedMesh Trio.png
diff --git a/.../generated_images/item_SpeedStore 512.png → .../generated_images/item_SpeedStore 512.png b/.../generated_images/item_SpeedStore 512.png → .../generated_images/item_SpeedStore 512.png
diff --git a/...enerated_images/item_SpeedSurface XXL.png → ...enerated_images/item_SpeedSurface XXL.png b/...enerated_images/item_SpeedSurface XXL.png → ...enerated_images/item_SpeedSurface XXL.png
diff --git a/...a/generated_images/item_SteamPro 2400.png → ...a/generated_images/item_SteamPro 2400.png b/...a/generated_images/item_SteamPro 2400.png → ...a/generated_images/item_SteamPro 2400.png
diff --git a/...erated_images/item_StudioPro Wireless.png → ...erated_images/item_StudioPro Wireless.png b/...erated_images/item_StudioPro Wireless.png → ...erated_images/item_StudioPro Wireless.png
diff --git a/...ta/generated_images/item_StudyMate A4.png → ...ta/generated_images/item_StudyMate A4.png b/...ta/generated_images/item_StudyMate A4.png → ...ta/generated_images/item_StudyMate A4.png
diff --git a/...ata/generated_images/item_TechPro Max.png → ...ata/generated_images/item_TechPro Max.png b/...ata/generated_images/item_TechPro Max.png → ...ata/generated_images/item_TechPro Max.png
diff --git a/...generated_images/item_TempControl Pro.png → ...generated_images/item_TempControl Pro.png b/...generated_images/item_TempControl Pro.png → ...generated_images/item_TempControl Pro.png
diff --git a/...generated_images/item_ThermalDip 2000.png → ...generated_images/item_ThermalDip 2000.png b/...generated_images/item_ThermalDip 2000.png → ...generated_images/item_ThermalDip 2000.png
diff --git a/...a/generated_images/item_ThunderBolt 4.png → ...a/generated_images/item_ThunderBolt 4.png b/...a/generated_images/item_ThunderBolt 4.png → ...a/generated_images/item_ThunderBolt 4.png
diff --git a/...erated_images/item_ToastMaster Deluxe.png → ...erated_images/item_ToastMaster Deluxe.png b/...erated_images/item_ToastMaster Deluxe.png → ...erated_images/item_ToastMaster Deluxe.png
diff --git a/...generated_images/item_TravelGuard Pro.png → ...generated_images/item_TravelGuard Pro.png b/...generated_images/item_TravelGuard Pro.png → ...generated_images/item_TravelGuard Pro.png
diff --git a/.../generated_images/item_TurboCharge 65.png → .../generated_images/item_TurboCharge 65.png b/.../generated_images/item_TurboCharge 65.png → .../generated_images/item_TurboCharge 65.png
diff --git a/...a/generated_images/item_TurboHeat Pro.png → ...a/generated_images/item_TurboHeat Pro.png b/...a/generated_images/item_TurboHeat Pro.png → ...a/generated_images/item_TurboHeat Pro.png
diff --git a/...nerated_images/item_UltraCharge 30000.png → ...nerated_images/item_UltraCharge 30000.png b/...nerated_images/item_UltraCharge 30000.png → ...nerated_images/item_UltraCharge 30000.png
diff --git a/...generated_images/item_UltraGrind Plus.png → ...generated_images/item_UltraGrind Plus.png b/...generated_images/item_UltraGrind Plus.png → ...generated_images/item_UltraGrind Plus.png
diff --git a/.../generated_images/item_UltraGuard Pro.png → .../generated_images/item_UltraGuard Pro.png b/.../generated_images/item_UltraGuard Pro.png → .../generated_images/item_UltraGuard Pro.png
diff --git a/...enerated_images/item_UltraHD Link 2.1.png → ...enerated_images/item_UltraHD Link 2.1.png b/...enerated_images/item_UltraHD Link 2.1.png → ...enerated_images/item_UltraHD Link 2.1.png
diff --git a/...a/generated_images/item_UltraLife AAA.png → ...a/generated_images/item_UltraLife AAA.png b/...a/generated_images/item_UltraLife AAA.png → ...a/generated_images/item_UltraLife AAA.png
diff --git a/.../generated_images/item_UltraStore 1TB.png → .../generated_images/item_UltraStore 1TB.png b/.../generated_images/item_UltraStore 1TB.png → .../generated_images/item_UltraStore 1TB.png
diff --git a/...nerated_images/item_UniControl Master.png → ...nerated_images/item_UniControl Master.png b/...nerated_images/item_UniControl Master.png → ...nerated_images/item_UniControl Master.png
diff --git a/...a/generated_images/item_VacMaster Pro.png → ...a/generated_images/item_VacMaster Pro.png b/...a/generated_images/item_VacMaster Pro.png → ...a/generated_images/item_VacMaster Pro.png
diff --git a/...nerated_images/item_VeggiePro Chopper.png → ...nerated_images/item_VeggiePro Chopper.png b/...nerated_images/item_VeggiePro Chopper.png → ...nerated_images/item_VeggiePro Chopper.png
diff --git a/...ated_images/item_WarmTech Storage 25L.png → ...ated_images/item_WarmTech Storage 25L.png b/...ated_images/item_WarmTech Storage 25L.png → ...ated_images/item_WarmTech Storage 25L.png
diff --git a/...a/generated_images/item_WarmZone 2000.png → ...a/generated_images/item_WarmZone 2000.png b/...a/generated_images/item_WarmZone 2000.png → ...a/generated_images/item_WarmZone 2000.png
diff --git a/...nerated_images/item_WiFi Ultra AC1200.png → ...nerated_images/item_WiFi Ultra AC1200.png b/...nerated_images/item_WiFi Ultra AC1200.png → ...nerated_images/item_WiFi Ultra AC1200.png
diff --git a/...a/generated_images/item_WorkPro Combo.png → ...a/generated_images/item_WorkPro Combo.png b/...a/generated_images/item_WorkPro Combo.png → ...a/generated_images/item_WorkPro Combo.png
diff --git a/generation/dataset_gen_amazon.py → recsysapp/generation/dataset_gen_amazon.py b/generation/dataset_gen_amazon.py → recsysapp/generation/dataset_gen_amazon.py
@@ -260,14 +260,14 @@ def generate_interactions(
     print("\nInteractions sample:")
     print(interactions.head())
 
-    data_path = pathlib.Path("feature_repo/data")
+    data_path = pathlib.Path("recsysapp/feature_repo/data")
     data_path.mkdir(parents=True, exist_ok=True)
 
     # Save to parquet files
-    users.to_parquet("feature_repo/data/recommendation_users.parquet", index=False)
-    items.to_parquet("feature_repo/data/recommendation_items.parquet", index=False)
+    users.to_parquet(data_path / "recommendation_users.parquet", index=False)
+    items.to_parquet(data_path / "recommendation_items.parquet", index=False)
     interactions.to_parquet(
-        "feature_repo/data/recommendation_interactions.parquet", index=False
+        data_path / "recommendation_interactions.parquet", index=False
     )
 
     # Create dummy dataframes for push source
@@ -300,15 +300,15 @@ def generate_interactions(
     )
 
     dummy_item_embed_df.to_parquet(
-        "feature_repo/data/dummy_item_embed.parquet", index=False
+        data_path / "dummy_item_embed.parquet", index=False
     )
     dummy_user_embed_df.to_parquet(
-        "feature_repo/data/dummy_user_embed.parquet", index=False
+        data_path / "dummy_user_embed.parquet", index=False
     )
-    dummy_user_items_df.to_parquet("feature_repo/data/user_items.parquet", index=False)
+    dummy_user_items_df.to_parquet(data_path / "user_items.parquet", index=False)
     dummy_textual_feature_df.to_parquet(
-        "feature_repo/data/item_textual_features_embed.parquet", index=False
+        data_path / "item_textual_features_embed.parquet", index=False
     )
     dummy_clip_feature_df.to_parquet(
-        "feature_repo/data/item_clip_features_embed.parquet", index=False
+        data_path / "item_clip_features_embed.parquet", index=False
     )
diff --git a/generation/generate_images.py → recsysapp/generation/generate_images.py b/generation/generate_images.py → recsysapp/generation/generate_images.py
@@ -8,7 +8,7 @@
 
 def main():
     data_directory = Path(__file__).parent.joinpath("data")
-    item_df = pd.read_parquet("feature_repo/data/item_df_output.parquet")
+    item_df = pd.read_parquet("recsysapp/feature_repo/data/item_df_output.parquet")
     pprint(item_df)
 
     # Load the Stable Diffusion pipeline (open model)

diff --git a/models/__init__.py → recsysapp/models/__init__.py b/models/__init__.py → recsysapp/models/__init__.py
diff --git a/models/data_util.py → recsysapp/models/data_util.py b/models/data_util.py → recsysapp/models/data_util.py
diff --git a/models/entity_tower.py → recsysapp/models/entity_tower.py b/models/entity_tower.py → recsysapp/models/entity_tower.py
diff --git a/models/filtering.py → recsysapp/models/filtering.py b/models/filtering.py → recsysapp/models/filtering.py
diff --git a/models/item_tower.py → recsysapp/models/item_tower.py b/models/item_tower.py → recsysapp/models/item_tower.py
diff --git a/models/train_two_tower.py → recsysapp/models/train_two_tower.py b/models/train_two_tower.py → recsysapp/models/train_two_tower.py
@@ -3,9 +3,9 @@
 import torch.nn as nn
 from torch.utils.data import DataLoader
 
-from models.data_util import UserItemMagnitudeDataset, preproccess_pipeline
-from models.entity_tower import EntityTower
-from models.two_tower import TwoTowerModel
+from recsysapp.models.data_util import UserItemMagnitudeDataset, preproccess_pipeline
+from recsysapp.models.entity_tower import EntityTower
+from recsysapp.models.two_tower import TwoTowerModel
 
 
 def create_and_train_two_tower(

diff --git a/models/two_tower.py → recsysapp/models/two_tower.py b/models/two_tower.py → recsysapp/models/two_tower.py
@@ -4,8 +4,8 @@
 import torch.nn as nn
 from torch import Tensor
 
-from models.item_tower import ItemTower
-from models.user_tower import UserTower
+from recsysapp.models.item_tower import ItemTower
+from recsysapp.models.user_tower import UserTower
 
 
 class TwoTowerModel(nn.Module):

diff --git a/models/user_tower.py → recsysapp/models/user_tower.py b/models/user_tower.py → recsysapp/models/user_tower.py
diff --git a/service/__init__.py → recsysapp/service/__init__.py b/service/__init__.py → recsysapp/service/__init__.py
diff --git a/service/clip_encoder.py → recsysapp/service/clip_encoder.py b/service/clip_encoder.py → recsysapp/service/clip_encoder.py
diff --git a/service/dataset_provider.py → recsysapp/service/dataset_provider.py b/service/dataset_provider.py → recsysapp/service/dataset_provider.py
@@ -27,8 +27,8 @@ def __init__(self, data_dir, force_load):
         self._loaded = False
 
         if (
-                self._item_df_path.exists() & self._user_df_path.exists()
-                & self._interaction_df_path.exists() & force_load is False
+                self._item_df_path.exists() and self._user_df_path.exists()
+                and self._interaction_df_path.exists() and (force_load is False)
         ):
             self._item_df = pd.read_parquet(self._item_df_path)
             self._user_df = pd.read_parquet(self._user_df_path)
@@ -52,7 +52,7 @@ def _save_dfs_to_parquet(self):
 
 class LocalDatasetProvider(DatasetProvider):
 
-    def __init__(self, store=None, data_dir="./feature_repo/data"):
+    def __init__(self, store=None, data_dir="./recsysapp/feature_repo/data"):
         super().__init__(data_dir, False)
         if self._loaded is False:
             assert store is not None
@@ -102,7 +102,7 @@ def _load_from_store(self, store: FeatureStore):
 
 class RemoteDatasetProvider(DatasetProvider):
 
-    def __init__(self, url: str, data_dir="./feature_repo/data", force_load=False):
+    def __init__(self, url: str, data_dir="./recsysapp/feature_repo/data", force_load=False):
         super().__init__(data_dir, force_load)
         if self._loaded is False:
             df = pd.read_csv(url)

diff --git a/service/search_by_image.py → recsysapp/service/search_by_image.py b/service/search_by_image.py → recsysapp/service/search_by_image.py
@@ -3,7 +3,7 @@
 from feast import FeatureStore
 from PIL import Image
 
-from service.clip_encoder import ClipEncoder
+from recsysapp.service.clip_encoder import ClipEncoder
 
 
 class SearchByImageService:

diff --git a/service/search_by_text.py → recsysapp/service/search_by_text.py b/service/search_by_text.py → recsysapp/service/search_by_text.py
diff --git a/tests/test_amazon_with_fixed_images.py b/tests/test_amazon_with_fixed_images.py
@@ -3,7 +3,7 @@
 import pandas as pd
 import pytest
 
-from generation.amazon_with_fixed_images import fix_url
+from recsysapp.generation.amazon_with_fixed_images import fix_url
 
 
 @pytest.fixture
@@ -23,7 +23,7 @@ def test_fix_url(wrong_url, correct_url):
 
 @pytest.fixture()
 def base_path():
-    return Path(__file__).parent.parent.joinpath('feature_repo').joinpath('data')
+    return Path(__file__).parent.parent.joinpath('recsysapp').joinpath('feature_repo').joinpath('data')
 
 
 @pytest.fixture

diff --git a/tests/test_clip_encoder.py b/tests/test_clip_encoder.py
@@ -8,7 +8,7 @@
 import torch
 from PIL import Image
 
-from service.clip_encoder import ClipEncoder
+from recsysapp.service.clip_encoder import ClipEncoder
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -47,7 +47,8 @@ def simple_images():
 
     generated_image_path = (
         Path(__file__)
-        .parent.parent.joinpath("generation")
+        .parent.parent.joinpath("recsysapp")
+        .joinpath("generation")
         .joinpath("data")
         .joinpath("generated_images")
     )

diff --git a/tests/test_create_and_train_two_tower.py b/tests/test_create_and_train_two_tower.py
@@ -1,8 +1,8 @@
 import pandas as pd
 import pytest
 
-from models.entity_tower import EntityTower
-from models.train_two_tower import create_and_train_two_tower
+from recsysapp.models.entity_tower import EntityTower
+from recsysapp.models.train_two_tower import create_and_train_two_tower
 
 
 @pytest.fixture

diff --git a/tests/test_data_util.py b/tests/test_data_util.py
@@ -4,7 +4,7 @@
 import pytest
 import torch
 
-from models.data_util import data_preproccess
+from recsysapp.models.data_util import data_preproccess
 
 
 @pytest.fixture

diff --git a/tests/test_entity_tower.py b/tests/test_entity_tower.py
@@ -1,7 +1,7 @@
 import pytest
 import torch
 
-from models.entity_tower import EntityTower
+from recsysapp.models.entity_tower import EntityTower
 
 D_MODEL = 64
 DIM_RATIO = {"numeric": 1, "categorical": 2, "text": 7, "image": 0}

diff --git a/tests/test_search_service.py b/tests/test_search_service.py
@@ -4,7 +4,7 @@
 import pytest
 import torch
 
-from service.search_by_text import SearchService
+from recsysapp.service.search_by_text import SearchService
 
 
 @pytest.fixture
@@ -33,8 +33,8 @@ def mock_feature_store():
 @pytest.fixture
 def search_service(mock_feature_store):
     with (
-        patch("service.search_by_text.AutoTokenizer") as mock_tokenizer,
-        patch("service.search_by_text.AutoModel") as mock_model,
+        patch("recsysapp.service.search_by_text.AutoTokenizer") as mock_tokenizer,
+        patch("recsysapp.service.search_by_text.AutoModel") as mock_model,
     ):
         # Mock the tokenizer
         mock_tokenizer.from_pretrained.return_value = Mock()