Skip to content

Convex call list messages from python #2

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion analyzer/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from flask_restful import Resource, Api
from convex import ConvexClient
from config import url as convex_url
from treehacks2023.analyzer.boundingBoxes import computeBoundingBox
from boundingBoxes import computeBoundingBox

app = Flask(__name__)
api = Api(app)
Expand All @@ -20,3 +20,13 @@ def get(self):

if __name__ == '__main__':
app.run(debug=True)

messages = client.query("listMessages")
print("PYTHON RPINT")
print(messages)
for message in messages:
if "format" in message and "url" in message and message["format"] == "image" and message["url"] != None:
print("URL", message["url"])
print(message["url"] == None)
# from pprint import pprint
# pprint(messages)
70 changes: 68 additions & 2 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,53 @@ import logo from './logo.svg';
import './App.css';
import { useQuery } from "./convex/_generated/react";
import { useMutation } from "./convex/_generated/react";
import { useRef, useState } from "react";

function Image({ message }) {
return <img src={message.url} height="300px" width="auto" />;
}

function App() {
const messages = useQuery("listMessages") || [];

// const data = useQuery("listMessages");
const sendMessage = useMutation("sendMessage");
const sendHello = () => sendMessage("Hello!", "me");
const sendMessage = useMutation("sendMessage:sendMessage");
const sendHello = () => sendMessage("Hello!", "me2");


const [name] = useState(() => "User " + Math.floor(Math.random() * 10000));

const imageInput = useRef(null);
const [selectedImage, setSelectedImage] = useState(null);

const generateUploadUrl = useMutation("sendMessage:generateUploadUrl");
const sendImage = useMutation("sendMessage:sendImage");

// async function handleSendMessage(event) {
// event.preventDefault();
// setNewMessageText("");
// if (newMessageText) {
// await sendMessage(newMessageText, name);
// }
// }

async function handleSendImage(event) {
event.preventDefault();
setSelectedImage(null);
imageInput.current.value = "";

// Step 1: Get a short-lived upload URL
const postUrl = await generateUploadUrl();
// Step 2: POST the file to the URL
const result = await fetch(postUrl, {
method: "POST",
headers: { "Content-Type": selectedImage.type },
body: selectedImage,
});
const { storageId } = await result.json();
// Step 3: Save the newly allocated storage id to the messages table
await sendImage(storageId, name);
}

return (
<div className="App">
Expand All @@ -24,6 +66,30 @@ function App() {
Learn React
</a>
<button onClick={sendHello}>click me!</button>
<form onSubmit={handleSendImage}>
<ul>
{messages.map(message => (
<li key={message._id.toString()}>
<span>{message.author}:</span>
{message.format === "image" ? (
<Image message={message} />
) : (
<span>{message.body}</span>
)}
<span>{new Date(message._creationTime).toLocaleTimeString()}</span>
</li>
))}
</ul>
<input
type="file"
accept="image/*"
ref={imageInput}
onChange={event => setSelectedImage(event.target.files[0])}
className="ms-2 btn btn-primary"
disabled={selectedImage}
/>
<input type="submit" value="Send Image" disabled={!selectedImage} />
</form>
</header>
</div>
);
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/convex/_generated/api.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

import type { ApiFromModules } from "convex/api";
import type * as listMessages from "../listMessages";
import type * as sendMessage from "../sendMessage";

/**
Expand All @@ -22,5 +23,6 @@ import type * as sendMessage from "../sendMessage";
* `ConvexReactClient` to create app-specific types.
*/
export type API = ApiFromModules<{
listMessages: typeof listMessages;
sendMessage: typeof sendMessage;
}>;
18 changes: 18 additions & 0 deletions frontend/src/convex/listMessages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { query } from "./_generated/server";

export default query(async ({ db, storage }) => {
const messages = await db.query("messages").collect();
for (const message of messages) {
if (message.format == "image") {
message.url = await storage.getUrl(message.body);
}
}
console.log("MESSAGES FORMAT", messages);

const messagesJSON = {}
messages.forEach((message, index) => {
messagesJSON[index] = message;
});
console.log("JSONN", messagesJSON);
return messages;
});
22 changes: 19 additions & 3 deletions frontend/src/convex/sendMessage.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
import { mutation } from "./_generated/server";

export default mutation(async ({ db }, body, author) => {
const message = { body: body, author: author, test1: "test2" };
await db.insert("messages", message);
// export default mutation(async ({ db }, body, author) => {
// const message = { body: body, author: author, test1: "test2" };
// await db.insert("messages", message);
// });

export const sendMessage = mutation(async ({ db }, body, author) => {
const message = { body, author, format: "text" };
await db.insert("messages", message);
});

// Generate a short-lived upload URL.
export const generateUploadUrl = mutation(async ({ storage }) => {
return await storage.generateUploadUrl();
});

// Save the storage ID within a message.
export const sendImage = mutation(async ({ db }, storageId, author) => {
const message = { body: storageId, author, format: "image" };
await db.insert("messages", message);
});