Created REST APP and Added Database Integration

Pipfile

@@ -6,8 +6,13 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
+numpy = "*"
 flask = "*"
+keras = "*"
+tensorflow = "*"
 boto3 = "*"
+pillow = "*"
+mypy-boto3-s3 = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.11"

Resources.md

@@ -4,4 +4,5 @@
 - [Flask Quickstart](https://flask.palletsprojects.com/en/2.3.x/quickstart/https://flask.palletsprojects.com/en/2.3.x/quickstart/)
 
 ## Database
-- [Use PostgreSQL with Flask](https://www.digitalocean.com/community/tutorials/how-to-use-a-postgresql-database-in-a-flask-application)
+- [Use PostgreSQL with Flask](https://www.digitalocean.com/community/tutorials/how-to-use-a-postgresql-database-in-a-flask-application)
+- [Flask ORM can read tables it did not create](https://www.reddit.com/r/flask/comments/5n6v3t/af_trying_to_connect_to_external_readonly_db_how/)

java/pom.xml

@@ -12,7 +12,7 @@
 	<artifactId>EZ-AI</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>EZ-AI</name>
-	<description>Demo project for Spring Boot</description>
+	<description>EZ-AI Spring Boot</description>
 	<properties>
 		<java.version>21</java.version>
 	</properties>
@@ -25,7 +25,6 @@
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
@@ -46,8 +45,14 @@
 			<artifactId>spring-kafka-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
 	</dependencies>
 
+
 	<build>
 		<plugins>
 			<plugin>

java/src/main/java/com/ezai/EZAI/EzAiApplication.java

@@ -2,6 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 public class EzAiApplication {
@@ -10,4 +12,9 @@ public static void main(String[] args) {
 		SpringApplication.run(EzAiApplication.class, args);
 	}
 
+	@Bean
+	public RestTemplate getRestTemplate() {
+		return new RestTemplate();
+	}
+
 }

java/src/main/java/com/ezai/EZAI/controller/EzAiController.java

@@ -0,0 +1,17 @@
+package com.ezai.EZAI.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+@RestController
+public class EzAiController {
+    @Autowired
+    RestTemplate restTemplate;
+
+    @RequestMapping("/test")
+    public String testMethod() {
+        return "Pass";
+    }
+}

java/src/main/java/com/ezai/EZAI/controller/UserController.java

@@ -0,0 +1,43 @@
+package com.ezai.EZAI.controller;
+
+import com.ezai.EZAI.entity.User;
+import com.ezai.EZAI.repository.UserRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+@RestController
+@RequestMapping("/user")
+public class UserController {
+    @Autowired
+    RestTemplate restTemplate;
+
+    private final UserRepo userRepo;
+
+    public UserController(UserRepo userRepo) {
+        this.userRepo = userRepo;
+    }
+
+    @RequestMapping(method = {GET}, path = "/retrieveAll")
+    public ResponseEntity getAllUsers(){
+        return ResponseEntity.ok(this.userRepo.findAll());
+    }
+
+    @RequestMapping(method = {GET}, path = "/retrieve")
+    public ResponseEntity getByEmail(@RequestParam String email){
+        return ResponseEntity.ok(this.userRepo.findByEmail(email));
+    }
+
+    @RequestMapping(method = {POST}, path = "/add", produces = MediaType.APPLICATION_JSON_VALUE)
+    public void addUser(@RequestBody User user){
+        userRepo.save(user);
+    }
+}

java/src/main/java/com/ezai/EZAI/entity/User.java

@@ -0,0 +1,30 @@
+package com.ezai.EZAI.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Entity(name = "User")
+@Table(name = "users")
+public class User {
+    @Id
+    private String email;
+    private String firstName;
+    private String lastName;
+    private String info;
+
+    public User() {
+    }
+
+    public User(String email, String firstName, String lastName, String info) {
+        this.email = email;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.info = info;
+    }
+
+}

java/src/main/java/com/ezai/EZAI/repository/UserRepo.java

@@ -0,0 +1,10 @@
+package com.ezai.EZAI.repository;
+
+import com.ezai.EZAI.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepo extends JpaRepository<User, String> {
+    User findByEmail(String email);
+}

java/src/main/resources/application.properties

@@ -1 +1,6 @@
-
+spring.datasource.url = jdbc:postgresql://localhost:5432/EzAiDB
+spring.datasource.username = postgres
+spring.datasource.password = ${POSTGRES_PASSWORD}
+spring.jpa.properties.hibernate,dialect = org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.hibernate.ddl-auto = update
+spring.jpa.show-sql = true

ml_backend/app.py

@@ -17,3 +17,14 @@ def upload():
     source_path = "tmp/dummy.keras"
     s3_destination_path = "models/01/dummy.keras"
     return utils.upload_to_s3(app, source_path, s3_destination_path)
+
+@app.route("/get_images")
+def get_image():
+    images, labels = utils.get_images_and_labels_from_s3(app, 1)
+    print(len(images))
+    print(len(labels))
+
+    print(images[0])
+    print(labels[0])
+
+    return "<p>Success!</p>"