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.

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

feat(platform): Agent Store V2 #8874

Merged
merged 311 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
311 commits
Select commit Hold shift + click to select a range
5adc6c0
more pages wip
Swiftyos Oct 17, 2024
4d69b2e
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Oct 17, 2024
b8c764a
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Oct 21, 2024
8811011
Organise Stories
Swiftyos Oct 21, 2024
b1ccdac
cleaned up code
Swiftyos Oct 21, 2024
10a2b36
fix accessability
Swiftyos Oct 21, 2024
8b03477
addded sidebar
Swiftyos Oct 21, 2024
88767a8
Add Agent table
Swiftyos Oct 22, 2024
44cb4e8
Add Creator Dashboard
Swiftyos Oct 22, 2024
dce436f
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Oct 22, 2024
259d6f2
Add login / logout functionality to navbar
Swiftyos Oct 22, 2024
120469c
verticaly centered the icon and text in popout menu items
Swiftyos Oct 22, 2024
d7fc2df
Added dispaly name
Swiftyos Oct 22, 2024
334b4d5
Added correct redirects for auth login
Swiftyos Oct 23, 2024
52119ea
Update auth flow and added localisation
Swiftyos Oct 23, 2024
d5d9ecd
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Oct 23, 2024
4869a8c
migrating project to nextjs style api usage
Swiftyos Oct 24, 2024
a70d6a5
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Oct 24, 2024
8db6959
storing notes on api schema
Swiftyos Oct 24, 2024
5943c75
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Oct 28, 2024
bacdc19
Updated hero section for new design
Swiftyos Oct 28, 2024
8dc22e2
updated navbar styling
Swiftyos Oct 28, 2024
03d754c
update featured agent and formatting
Swiftyos Oct 28, 2024
a955794
updated featured store card
Swiftyos Oct 28, 2024
d73acd1
tweaking feature card
Swiftyos Oct 28, 2024
4503dab
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Oct 29, 2024
ebad484
feat(platform): Add Publish agent flow section (#8462)
Bentlybro Oct 29, 2024
e5a4b9a
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Oct 29, 2024
d9710ce
Added RSC and update filter chips and search bar to work as expected
Swiftyos Oct 29, 2024
f0650d1
dont want to lose thse
Swiftyos Oct 30, 2024
d16c1f2
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 1, 2024
f9eefae
update yarn lock
Swiftyos Nov 1, 2024
b9763aa
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Nov 1, 2024
1580fb5
update yarn lock again
Swiftyos Nov 1, 2024
29a61ab
Merge branch 'swiftyos/open-1920-marketplace-home-components' into sw…
Swiftyos Nov 4, 2024
c27f163
removed all services that are not strictly necessary for running the …
Swiftyos Nov 5, 2024
52de224
added comments
Swiftyos Nov 5, 2024
496990c
Merge branch 'docker-qol' into swiftyos/open-1993-add-rsc-and-mocking…
Swiftyos Nov 5, 2024
5145aa7
adding store endpoints
Swiftyos Nov 5, 2024
707c485
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Nov 6, 2024
7e6bdf8
Merge branch 'swiftyos/open-1993-add-rsc-and-mocking-of-api-to-storyb…
Swiftyos Nov 6, 2024
2af974b
remove diff
Swiftyos Nov 6, 2024
c07ea4f
remove diff
Swiftyos Nov 6, 2024
9a6ff40
remove docker compose full file
Swiftyos Nov 6, 2024
946ba02
revent changes to docker file
Swiftyos Nov 6, 2024
ef4776f
revert changes to docker file
Swiftyos Nov 6, 2024
7044782
update lock files
Swiftyos Nov 6, 2024
2340e9b
Added AuthProvider
Swiftyos Nov 6, 2024
15befae
wip server
Swiftyos Nov 6, 2024
bf459a1
feat(platform): Profile page v2 (#8518)
Bentlybro Nov 7, 2024
b9c7d1a
feat(platform): Add settings page (#8576)
Bentlybro Nov 7, 2024
c345a79
Updated Schema to include user groups
Swiftyos Nov 7, 2024
35ec676
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Nov 7, 2024
40f38fc
Adding api endpoints
Swiftyos Nov 7, 2024
deee943
Refactoring the v2 api code
Swiftyos Nov 7, 2024
ff0e786
Formatting and added migration
Swiftyos Nov 7, 2024
0e9906e
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 7, 2024
c63ccb5
Added backend
Swiftyos Nov 8, 2024
bd00338
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Nov 8, 2024
da15408
add model tests
Swiftyos Nov 8, 2024
43ac5e0
formatting
Swiftyos Nov 8, 2024
ef473bb
updated migration
Swiftyos Nov 8, 2024
715e4c7
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 8, 2024
7f74146
add views and db tests
Swiftyos Nov 8, 2024
5ac2e70
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Nov 8, 2024
bc1d11b
isort fmt
Swiftyos Nov 8, 2024
fa933ad
fmt
Swiftyos Nov 8, 2024
4562606
fix liniting formatting, and icon selection in the frontend
Swiftyos Nov 8, 2024
9dab7c9
fix url sacnitization
Swiftyos Nov 8, 2024
aa5d304
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 11, 2024
e8eda51
updated execpetion handling
Swiftyos Nov 11, 2024
04d3619
add test data generator
Swiftyos Nov 11, 2024
2068073
propgate removal of graph parents
Swiftyos Nov 11, 2024
f539c24
wip
Swiftyos Nov 11, 2024
d3e7aab
end-to-end working
Swiftyos Nov 11, 2024
a8a0da1
add pages and update links
Swiftyos Nov 12, 2024
38b20e6
remove use client
Swiftyos Nov 12, 2024
a71b2a1
hooking up pages, added missing update at
Swiftyos Nov 12, 2024
c879599
fix migration
Swiftyos Nov 12, 2024
abb8134
update search url
Swiftyos Nov 12, 2024
45a2826
feat(platform): Updates to Creator page (#8624)
Bentlybro Nov 12, 2024
c44fd73
update creator page
Swiftyos Nov 12, 2024
1292c85
Delete creator details
Swiftyos Nov 12, 2024
d78b4d9
feat(platform): Updates to Profile popout menu (#8629)
Bentlybro Nov 12, 2024
a1ba3b1
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 13, 2024
6351ba7
update locks
Swiftyos Nov 13, 2024
d17ea2d
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Nov 13, 2024
760e2ff
delete api pages
Swiftyos Nov 13, 2024
9aec1f5
integrated navbar
Swiftyos Nov 13, 2024
175f17b
wip adding dashboard, profile and settings page
Swiftyos Nov 13, 2024
8e63a4a
Add outline of the search results page
Swiftyos Nov 13, 2024
5db220c
tidy up
Swiftyos Nov 13, 2024
6aba1bc
fmt
Swiftyos Nov 13, 2024
28a327c
merge in dev
Swiftyos Nov 15, 2024
9f71fb9
update poetry lock
Swiftyos Nov 15, 2024
65344b9
feat(platform): Updates to Profile and Settings page (#8694)
Bentlybro Nov 20, 2024
afe5c12
feat(platform): Updates to Agent Page (#8664)
Bentlybro Nov 20, 2024
f6c1bdc
feat(platform): Updates to agent dashboard (#8598)
Bentlybro Nov 20, 2024
c315b8e
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 20, 2024
7a41f36
update lock file
Swiftyos Nov 20, 2024
7847663
fix migrations
Swiftyos Nov 20, 2024
17db193
Merge branch 'dev' into swiftyos/open-1920-marketplace-home-components
Swiftyos Nov 21, 2024
18b5f20
update poetry locl
Swiftyos Nov 21, 2024
610a5b9
Added theme toggle, fixed navbar
Swiftyos Nov 21, 2024
84cdf18
udpate z level so it is always ontop
Swiftyos Nov 21, 2024
a53f3f0
dark mode tweaks
Swiftyos Nov 21, 2024
64fcba3
updates
Swiftyos Nov 25, 2024
a9693b5
profile page working
Swiftyos Nov 25, 2024
518f196
feat(platform): Updates to Home page (#8753)
Bentlybro Nov 25, 2024
9616baf
switch to gcs
Swiftyos Nov 26, 2024
cacc6e1
file uploads working
Swiftyos Nov 26, 2024
8c5380d
fix creator page layout
Swiftyos Nov 26, 2024
abbed40
dashboard updates
Swiftyos Nov 26, 2024
9255759
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Nov 26, 2024
faa683b
update lock file
Swiftyos Nov 26, 2024
244171d
wip creat agent
Swiftyos Nov 26, 2024
3f3919a
Create store agent now working
Swiftyos Nov 27, 2024
d16cf6c
add slug
Swiftyos Nov 27, 2024
db32848
getting dashboard working
Swiftyos Nov 27, 2024
d4b69d8
formatting
Swiftyos Nov 27, 2024
c1c3fd4
feat(platform): Updates to Search page (#8769)
Bentlybro Nov 27, 2024
93d3bd3
feat(platform): Tweaks to Search page (#8806)
Bentlybro Nov 27, 2024
0c78edb
Added logout
Swiftyos Nov 28, 2024
4278ae6
hooked up become a creator
Swiftyos Nov 28, 2024
5530db6
Fix styling on home page
Swiftyos Nov 28, 2024
6c64c5b
OPEN-2127 make tutorial button show only in the builder
Swiftyos Nov 28, 2024
e063f4b
Navbar publish agent button hooked up
Swiftyos Nov 28, 2024
2bbac57
Search results styling and filter functionality
Swiftyos Nov 28, 2024
f297e42
dark mode color
Swiftyos Nov 28, 2024
86a1085
formatting
Swiftyos Nov 28, 2024
52d19d0
Blocks control dark mode
Swiftyos Nov 28, 2024
bc277ac
Control Panel Dark mode
Swiftyos Nov 28, 2024
65ada3f
Update Save Control
Swiftyos Nov 28, 2024
da10f1a
updated custom node dark mode
Swiftyos Nov 28, 2024
100b667
updated node input dark mode
Swiftyos Nov 28, 2024
fabf742
updated node hadles dark mode
Swiftyos Nov 28, 2024
37e6b6f
Add dark mode to flow and utils
Swiftyos Nov 28, 2024
bb13157
formatting
Swiftyos Nov 28, 2024
1e66137
more dark mode colors
Swiftyos Nov 29, 2024
5a4083d
Added tooltip for credits button
Swiftyos Nov 29, 2024
f445918
comment out arrow buttons on breadcrumbs
Swiftyos Nov 29, 2024
19ff8f3
normalise styling between agent and creator page
Swiftyos Nov 29, 2024
3ccf013
remove notification section of settings page
Swiftyos Nov 29, 2024
cd9c421
only show agents that have no store listing
Swiftyos Nov 29, 2024
acb35c3
tweak layout
Swiftyos Nov 29, 2024
9db8832
fixed agent images not showing
Swiftyos Nov 29, 2024
a971d59
handle sorting of agents
Swiftyos Nov 29, 2024
a4b186c
add sorting of creators too
Swiftyos Nov 29, 2024
b3fd8bb
added option to change password in settings
Swiftyos Dec 2, 2024
39c9e4a
Merge remote-tracking branch 'origin/dev' into swiftyos/open-1920-mar…
Swiftyos Dec 2, 2024
48d27c9
update lock files
Swiftyos Dec 2, 2024
53eee63
feat(platform): Adds rating card (#8840)
Bentlybro Dec 2, 2024
fdb82ed
Added deleting submissions and viewing the popout
Swiftyos Dec 2, 2024
0f77f93
Merge branch 'swiftyos/open-1920-marketplace-home-components' of gith…
Swiftyos Dec 2, 2024
f238714
fix tests
Swiftyos Dec 2, 2024
30a047e
signup now redirects to edit profile page
Swiftyos Dec 2, 2024
1ab19dc
Merge remote-tracking branch 'origin/dev' into dev-store-v2
Swiftyos Dec 3, 2024
91aa371
add api routes for reviewing agents
Swiftyos Dec 3, 2024
b3bd0f5
trying too hook up rating card
Swiftyos Dec 3, 2024
f54cfee
formatting
Swiftyos Dec 3, 2024
303a551
linting
Swiftyos Dec 3, 2024
8f4d552
updated packages
Swiftyos Dec 4, 2024
7fdfffd
Merge remote-tracking branch 'origin/dev' into dev-store-v2
Swiftyos Dec 4, 2024
f3168ea
update docker compose test to use env vars
Swiftyos Dec 4, 2024
4e886bd
fixing tests
Swiftyos Dec 4, 2024
0eda63f
fixing ci
Swiftyos Dec 4, 2024
715d425
delete pages
Swiftyos Dec 4, 2024
3b24b0a
skip tests during build
aarushik93 Dec 4, 2024
5b0ecfd
update package.json
aarushik93 Dec 4, 2024
d5580f8
prevent static gen
aarushik93 Dec 4, 2024
12eb3b2
remove experimental
aarushik93 Dec 4, 2024
2ed8347
commented out generateStaticParams
Swiftyos Dec 4, 2024
4f20f86
disabling request during build
Swiftyos Dec 4, 2024
6041754
make store work wihout env vars
Swiftyos Dec 4, 2024
6a736cc
added loging headers
Swiftyos Dec 4, 2024
4492995
graceful fail locale
Swiftyos Dec 4, 2024
ab4f454
fixed type errors
Swiftyos Dec 5, 2024
fa87107
fix linting errors
Swiftyos Dec 5, 2024
50d0865
updating locale parsing
Swiftyos Dec 5, 2024
3d0ec9c
redirect to store as home page
Swiftyos Dec 5, 2024
9b45661
update lock files
Swiftyos Dec 5, 2024
ec072ad
Merge remote-tracking branch 'origin/dev' into dev-store-v2
Swiftyos Dec 5, 2024
f77172e
update lock fie
Swiftyos Dec 5, 2024
d201b65
fixing merge conflict
Swiftyos Dec 5, 2024
8d8664a
remove lang and comment out backend provider
Swiftyos Dec 9, 2024
3da5fc2
prevented importing the context whenever the client is used
Swiftyos Dec 9, 2024
1d81c61
added provider back and updated imports in custom node
Swiftyos Dec 9, 2024
6d6ed34
updated rating card
Swiftyos Dec 9, 2024
14ecaf8
feat(frontend): Update fonts + updates to agent page (#8886)
Bentlybro Dec 9, 2024
9c0e875
remove unused global
Swiftyos Dec 9, 2024
f4244e5
remove rating card
Swiftyos Dec 9, 2024
6a712fd
linting
Swiftyos Dec 9, 2024
0217b75
Merge remote-tracking branch 'origin/dev' into dev-store-v2
Swiftyos Dec 9, 2024
6ccf62c
tweaks to work with monitoring page
Swiftyos Dec 9, 2024
6c34f8b
update lock files
Swiftyos Dec 9, 2024
89e8fe3
fixes
Swiftyos Dec 9, 2024
3145f3d
linting
Swiftyos Dec 9, 2024
7a11760
updated monitoring page
Swiftyos Dec 10, 2024
f1053ff
remove marketplace api
Swiftyos Dec 10, 2024
b86b0c7
updated poetry lock file
Swiftyos Dec 10, 2024
452fe31
update docker build
Swiftyos Dec 10, 2024
006e843
fix docker build
Swiftyos Dec 10, 2024
980c90c
match base images
Swiftyos Dec 10, 2024
9bc7230
fix market image
Swiftyos Dec 10, 2024
d14cecb
fix import
Swiftyos Dec 10, 2024
b5e1c80
removed unused font import
Swiftyos Dec 10, 2024
c7ae4cf
fixes
Swiftyos Dec 10, 2024
c91099a
added dynamic to force page rendering
Swiftyos Dec 10, 2024
b7603f6
Update Dockerfile to set HOSTNAME environment variable for developmen…
Swiftyos Dec 10, 2024
a8ae006
remove launch darkly
Swiftyos Dec 10, 2024
afd809f
re-enable launch darkly
Swiftyos Dec 10, 2024
0fb33f6
add healty page
Swiftyos Dec 10, 2024
54baa84
remove marketplace api
Swiftyos Dec 10, 2024
07d732e
removing templates
Swiftyos Dec 10, 2024
c35453f
Merge branch 'dev-store-v2-runner' of github.com:Significant-Gravitas…
Swiftyos Dec 11, 2024
ac03211
removed templates form ui
Swiftyos Dec 11, 2024
b1468f7
Allow running of agents from the monitor page
Swiftyos Dec 11, 2024
6fcceea
formatting
Swiftyos Dec 11, 2024
32c1543
comment out all old marketplace componets
Swiftyos Dec 11, 2024
91fb4f5
remove superfulus button
Swiftyos Dec 11, 2024
e508d90
add try catch on credit api
Swiftyos Dec 12, 2024
3c024be
change to using settings config rather than dotenv
Swiftyos Dec 12, 2024
987fe6d
Merge remote-tracking branch 'origin/dev' into dev-store-v2
Swiftyos Dec 12, 2024
72e9dd6
fix schema merge conflicts
Swiftyos Dec 12, 2024
4af2297
fix schema migrations
Swiftyos Dec 12, 2024
dec9dfa
fmt
Swiftyos Dec 12, 2024
d67c7a3
update auth tests
Swiftyos Dec 12, 2024
584b121
types
Swiftyos Dec 12, 2024
1a4a3e7
fixed build tests
Swiftyos Dec 13, 2024
e5c21ce
fix login
Swiftyos Dec 13, 2024
f6ad194
fix profile tests
Swiftyos Dec 13, 2024
14c2234
added in other browsers
Swiftyos Dec 13, 2024
a597507
Merge branch 'dev' into dev-store-v2
Swiftyos Dec 13, 2024
940d613
lint
Swiftyos Dec 13, 2024
3b0af7b
Merge branch 'dev-store-v2' of github.com:Significant-Gravitas/AutoGP…
Swiftyos Dec 13, 2024
1773639
fmt
Swiftyos Dec 13, 2024
128c865
updated yarn lock
Swiftyos Dec 13, 2024
7d317c2
format playwright
Swiftyos Dec 13, 2024
bebe1d5
feat:(backend/test) update test_data_creator.py (#8974)
Bentlybro Dec 13, 2024
4c5e4d5
fix file
Swiftyos Dec 13, 2024
a238bcc
fix auth tests
Swiftyos Dec 13, 2024
918c1cf
remove the monitor page tests as we are removing it
Swiftyos Dec 13, 2024
787c431
sanitized_query
Swiftyos Dec 13, 2024
84a27b2
update media tests
Swiftyos Dec 13, 2024
11e34d9
fix python multipart issue
Swiftyos Dec 13, 2024
4b1a580
fmt
Swiftyos Dec 13, 2024
7d5accf
increased timeout
Swiftyos Dec 13, 2024
a0667e7
remove firefox as a test runner
Swiftyos Dec 13, 2024
4026aec
update tests
Swiftyos Dec 13, 2024
f5bf4d3
change page load detection in tests
Swiftyos Dec 13, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,6 @@ LICENSE.rtf
autogpt_platform/backend/settings.py
/.auth
/autogpt_platform/frontend/.auth
.test-contents

*.ign.*
.test-contents
9 changes: 9 additions & 0 deletions autogpt_platform/autogpt_libs/autogpt_libs/auth/depends.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,12 @@ def verify_user(payload: dict | None, admin_only: bool) -> User:
raise fastapi.HTTPException(status_code=403, detail="Admin access required")

return User.from_payload(payload)


def get_user_id(payload: dict = fastapi.Depends(auth_middleware)) -> str:
user_id = payload.get("sub")
if not user_id:
raise fastapi.HTTPException(
status_code=401, detail="User ID not found in token"
)
return user_id
Swiftyos marked this conversation as resolved.
Show resolved Hide resolved
35 changes: 20 additions & 15 deletions autogpt_platform/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,23 @@ ENV PYTHONUNBUFFERED 1

WORKDIR /app

# Install build dependencies
RUN apt-get update \
&& apt-get install -y build-essential curl ffmpeg wget libcurl4-gnutls-dev libexpat1-dev libpq5 gettext libz-dev libssl-dev postgresql-client git \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN echo 'Acquire::http::Pipeline-Depth 0;\nAcquire::http::No-Cache true;\nAcquire::BrokenProxy true;\n' > /etc/apt/apt.conf.d/99fixbadproxy

ENV POETRY_VERSION=1.8.3 \
POETRY_HOME="/opt/poetry" \
POETRY_NO_INTERACTION=1 \
POETRY_VIRTUALENVS_CREATE=false \
PATH="$POETRY_HOME/bin:$PATH"
RUN apt-get update --allow-releaseinfo-change --fix-missing

# Install build dependencies
RUN apt-get install -y build-essential
RUN apt-get install -y libpq5
RUN apt-get install -y libz-dev
RUN apt-get install -y libssl-dev
RUN apt-get install -y postgresql-client

ENV POETRY_VERSION=1.8.3
ENV POETRY_HOME=/opt/poetry
ENV POETRY_NO_INTERACTION=1
ENV POETRY_VIRTUALENVS_CREATE=false
ENV PATH=/opt/poetry/bin:$PATH
Swiftyos marked this conversation as resolved.
Show resolved Hide resolved

# Upgrade pip and setuptools to fix security vulnerabilities
RUN pip3 install --upgrade pip setuptools

Expand All @@ -39,11 +44,11 @@ FROM python:3.11.10-slim-bookworm AS server_dependencies

WORKDIR /app

ENV POETRY_VERSION=1.8.3 \
POETRY_HOME="/opt/poetry" \
POETRY_NO_INTERACTION=1 \
POETRY_VIRTUALENVS_CREATE=false \
PATH="$POETRY_HOME/bin:$PATH"
ENV POETRY_VERSION=1.8.3
ENV POETRY_HOME=/opt/poetry
ENV POETRY_NO_INTERACTION=1
ENV POETRY_VIRTUALENVS_CREATE=false
ENV PATH=/opt/poetry/bin:$PATH


# Upgrade pip and setuptools to fix security vulnerabilities
Expand Down
2 changes: 1 addition & 1 deletion autogpt_platform/backend/backend/blocks/pinecone.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def run(
top_k=input_data.top_k,
include_values=input_data.include_values,
include_metadata=input_data.include_metadata,
).to_dict()
).to_dict() # type: ignore
combined_text = ""
if results["matches"]:
texts = [
Expand Down
2 changes: 1 addition & 1 deletion autogpt_platform/backend/backend/data/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def SchemaField(
exclude=exclude,
json_schema_extra=json_extra,
**kwargs,
)
) # type: ignore
Swiftyos marked this conversation as resolved.
Show resolved Hide resolved


class _BaseCredentials(BaseModel):
Expand Down
6 changes: 5 additions & 1 deletion autogpt_platform/backend/backend/server/rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import backend.data.graph
import backend.data.user
import backend.server.routers.v1
import backend.server.v2.store.routes
import backend.util.service
import backend.util.settings

Expand Down Expand Up @@ -84,7 +85,10 @@ def handler(request: fastapi.Request, exc: Exception):

app.add_exception_handler(ValueError, handle_internal_http_error(400))
app.add_exception_handler(Exception, handle_internal_http_error(500))
app.include_router(backend.server.routers.v1.v1_router, tags=["v1"])
app.include_router(backend.server.routers.v1.v1_router, tags=["v1"], prefix="/api")
app.include_router(
backend.server.v2.store.routes.router, tags=["v2"], prefix="/api/store"
)


@app.get(path="/health", tags=["health"], dependencies=[])
Expand Down
5 changes: 2 additions & 3 deletions autogpt_platform/backend/backend/server/routers/v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ def execution_scheduler_client() -> ExecutionScheduler:
_user_credit_model = get_user_credit_model()

# Define the API routes
v1_router = APIRouter(prefix="/api")

v1_router = APIRouter()

v1_router.include_router(
backend.server.integrations.router.router,
Expand Down Expand Up @@ -132,7 +131,7 @@ def execute_graph_block(block_id: str, data: BlockInput) -> CompletedBlockOutput

@v1_router.get(path="/credits", dependencies=[Depends(auth_middleware)])
async def get_user_credits(
user_id: Annotated[str, Depends(get_user_id)]
user_id: Annotated[str, Depends(get_user_id)],
) -> dict[str, int]:
# Credits can go negative, so ensure it's at least 0 for user to see.
return {"credits": max(await _user_credit_model.get_or_refill_credit(user_id), 0)}
Expand Down
Swiftyos marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Loading
Loading