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

Fix site package installation location #1779

Merged
merged 12 commits into from
Jan 8, 2025
Merged

Fix site package installation location #1779

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4770f12
Remove dependency on pyproject.toml in site package
NolanTrem Jan 8, 2025
57acfce
Add package_data
NolanTrem Jan 8, 2025
84c2a34
Move to include, mapped by poetry
NolanTrem Jan 8, 2025
68f9fd9
Bump
NolanTrem Jan 8, 2025
e57f5ba
Poetry enforces stricter package rules
NolanTrem Jan 8, 2025
afb4295
Fix compose.full
NolanTrem Jan 8, 2025
ea57b18
Merge branch 'main' into Nolan/SitePackage
NolanTrem Jan 8, 2025
1c212da
Restore workflow
NolanTrem Jan 8, 2025
2de3bc1
Merge branch 'Nolan/SitePackage' of github.com:SciPhi-AI/R2R into Nol…
NolanTrem Jan 8, 2025
fb3b3dc
config location
NolanTrem Jan 8, 2025
01503c8
Test location
NolanTrem Jan 8, 2025
231fae5
Include files AND packages in wheel
NolanTrem Jan 8, 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
6 changes: 3 additions & 3 deletions py/cli/utils/docker_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,10 @@ def get_compose_files():
"..",
)
compose_files = {
"base": os.path.join(package_dir, "compose.yaml"),
"full": os.path.join(package_dir, "compose.full.yaml"),
"base": os.path.join(package_dir, "r2r", "compose.yaml"),
"full": os.path.join(package_dir, "r2r", "compose.full.yaml"),
"full_scale": os.path.join(
package_dir, "compose.full_with_replicas.yaml"
package_dir, "r2r", "compose.full_with_replicas.yaml"
),
}

Expand Down
40 changes: 20 additions & 20 deletions py/core/main/api/v3/users_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,9 +1537,6 @@ async def create_user_api_key(
403,
)

print("name =", name)
print("description =", description)

api_key = await self.services.auth.create_user_api_key(
id, name=name, description=description
)
Expand Down Expand Up @@ -1753,28 +1750,31 @@ async def get_user_limits(
"x-codeSamples": [
{
"lang": "Python",
"source": """
from r2r import R2RClient
"source": textwrap.dedent(
"""
from r2r import R2RClient

client = R2RClient()
client.login(...) # Or some other auth flow
client = R2RClient()
client.login(...) # Or some other auth flow

metadata_update = {
"some_key": "some_value",
"old_key": ""
}
updated_user = client.users.patch_metadata("550e8400-e29b-41d4-a716-446655440000", metadata_update)
print(updated_user)
""",
metadata_update = {
"some_key": "some_value",
"old_key": ""
}
updated_user = client.users.patch_metadata("550e8400-e29b-41d4-a716-446655440000", metadata_update)
""",
),
},
{
"lang": "cURL",
"source": """
curl -X PATCH "https://api.example.com/v3/users/550e8400-e29b-41d4-a716-446655440000/metadata" \\
-H "Authorization: Bearer YOUR_API_TOKEN" \\
-H "Content-Type: application/json" \\
-d '{"some_key":"some_value","old_key":""}'
""",
"source": textwrap.dedent(
"""
curl -X PATCH "https://api.example.com/v3/users/550e8400-e29b-41d4-a716-446655440000/metadata" \\
-H "Authorization: Bearer YOUR_API_TOKEN" \\
-H "Content-Type: application/json" \\
-d '{"some_key":"some_value","old_key":""}'
""",
),
},
]
},
Expand Down
Loading
Loading