Storage get count

1-pack_web_static.py

@@ -18,5 +18,6 @@ def do_pack():
         file_name = "versions/web_static_{}.tgz".format(date)
         local("tar -cvzf {} web_static".format(file_name))
         return file_name
-    except:
+    except Exception as e:
+        print(f"error: {e}")
         return None

2-do_deploy_web_static.py

@@ -26,5 +26,6 @@ def do_deploy(archive_path):
         run('rm -rf /data/web_static/current')
         run('ln -s {}{}/ /data/web_static/current'.format(path, no_ext))
         return True
-    except:
+    except Exception as e:
+        print(f"error: {e}")
         return False

3-deploy_web_static.py

@@ -19,7 +19,8 @@ def do_pack():
         file_name = "versions/web_static_{}.tgz".format(date)
         local("tar -cvzf {} web_static".format(file_name))
         return file_name
-    except:
+    except Exception as e:
+        print(f"error: {e}")
         return None
 
 
@@ -40,7 +41,8 @@ def do_deploy(archive_path):
         run('rm -rf /data/web_static/current')
         run('ln -s {}{}/ /data/web_static/current'.format(path, no_ext))
         return True
-    except:
+    except Exception as e:
+        print(f"error: {e}")
         return False
 
 

AUTHORS

@@ -3,4 +3,5 @@
 
 Jennifer Huang <[email protected]>
 Alexa Orrico <[email protected]>
-Joann Vuong <[email protected]> 
+Joann Vuong <[email protected]>
+Joana Casallas <[email protected]>

README.md

@@ -1,5 +1,13 @@
-# AirBnB Clone - The Console
-The console is the first segment of the AirBnB project at Holberton School that will collectively cover fundamental concepts of higher level programming. The goal of AirBnB project is to eventually deploy our server a simple copy of the AirBnB Website(HBnB). A command interpreter is created in this segment to manage objects for the AirBnB(HBnB) website.
+# AirBnB clone - RESTful API
+The goal of AirBnB project is to eventually deploy our server a simple copy of the AirBnB Website(HBnB). A command interpreter is created in this segment to manage objects for the AirBnB(HBnB) website.
+
+We will have a complete web application composed by:
+
+* A command interpreter to manipulate data without a visual interface, like in a Shell (perfect for development and debugging)  
+* A website (the front-end) that shows the final product to everybody: static and dynamic  
+* A database or files that store data (data = objects)  
+* An API that provides a communication interface between the front-end and your data (retrieve, create, delete, update them)  
+
 
 #### Functionalities of this command interpreter:
 * Create a new object (ex: a new User or a new Place)
@@ -8,6 +16,11 @@ The console is the first segment of the AirBnB project at Holberton School that
 * Update attributes of an object
 * Destroy an object
 
+#### RESTful API:
+* Expose all your objects stored via a JSON web interface  
+* Manipulate your objects via a RESTful API
+
+
 ## Table of Content
 * [Environment](#environment)
 * [Installation](#installation)
@@ -156,6 +169,7 @@ No known bugs at this time.
 ## Authors
 Alexa Orrico - [Github](https://github.com/alexaorrico) / [Twitter](https://twitter.com/alexa_orrico)  
 Jennifer Huang - [Github](https://github.com/jhuang10123) / [Twitter](https://twitter.com/earthtojhuang)
+Joana Casallas - [Github](https://github.com/joacasallas2) / [Twitter](https://twitter.com/joanacasallas)
 
 Second part of Airbnb: Joann Vuong
 ## License

api/v1/app.py

@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+# Author: Joana Casallas
+"""Flask App"""
+import os
+from flask import Flask
+from models import storage
+from api.v1.views import app_views
+
+
+app = Flask(__name__)
+
+
+app.register_blueprint(app_views)
+
+
+@app.teardown_appcontext
+def teardown_db(exception):
+    """Remove the current SQLAlchemy session after each request"""
+    storage.close()
+
+
+if __name__ == '__main__':
+    host = os.getenv("HBNB_API_HOST", "0.0.0.0")
+    port = int(os.getenv("HBNB_API_PORT", "5000"))
+    app.run(host=host, port=port, threaded=True)

api/v1/views/__init__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/python3
+# Author: Joana Casallas
+"""Blueprint app_views"""
+from flask import Blueprint, render_template, abort
+from jinja2 import TemplateNotFound
+
+
+app_views = Blueprint('app_views', __name__, url_prefix='/api/v1')
+from api.v1.views.index import *  # noqa: F401

api/v1/views/index.py

@@ -0,0 +1,11 @@
+#!/usr/bin/python3
+# Author: Joana Casallas
+"""Index API"""
+from flask import jsonify
+from api.v1.views import app_views
+
+
+@app_views.route('/status', methods=['GET'])
+def status():
+    """Return API status"""
+    return jsonify({"status": "OK"})

console.py

@@ -46,10 +46,10 @@ def _key_value_parser(self, args):
                 else:
                     try:
                         value = int(value)
-                    except:
+                    except ValueError:
                         try:
                             value = float(value)
-                        except:
+                        except ValueError:
                             continue
                 new_dict[key] = value
         return new_dict
@@ -140,12 +140,12 @@ def do_update(self, arg):
                                 if args[2] in integers:
                                     try:
                                         args[3] = int(args[3])
-                                    except:
+                                    except ValueError:
                                         args[3] = 0
                                 elif args[2] in floats:
                                     try:
                                         args[3] = float(args[3])
-                                    except:
+                                    except ValueError:
                                         args[3] = 0.0
                             setattr(models.storage.all()[k], args[2], args[3])
                             models.storage.all()[k].save()
@@ -160,5 +160,6 @@ def do_update(self, arg):
         else:
             print("** class doesn't exist **")
 
+
 if __name__ == '__main__':
     HBNBCommand().cmdloop()

file.json

@@ -0,0 +1,44 @@
+{
+    "Amenity.1d4df609-a0e2-4bc9-9f80-3f6835e4fb24": {
+        "id": "1d4df609-a0e2-4bc9-9f80-3f6835e4fb24",
+        "created_at": "2025-02-07T23:25:06.682825",
+        "updated_at": "2025-02-07T23:25:06.682825",
+        "__class__": "Amenity"
+    },
+    "BaseModel.5a961649-9ec0-4785-a7ea-4e19225a714c": {
+        "id": "5a961649-9ec0-4785-a7ea-4e19225a714c",
+        "created_at": "2025-02-07T23:25:06.682832",
+        "updated_at": "2025-02-07T23:25:06.682832",
+        "__class__": "BaseModel"
+    },
+    "City.6f316a8d-3233-4bc8-9c30-e0a6280cf55d": {
+        "id": "6f316a8d-3233-4bc8-9c30-e0a6280cf55d",
+        "created_at": "2025-02-07T23:25:06.682838",
+        "updated_at": "2025-02-07T23:25:06.682838",
+        "__class__": "City"
+    },
+    "Place.e5becbd2-1fff-41f2-86b4-188dbe114339": {
+        "id": "e5becbd2-1fff-41f2-86b4-188dbe114339",
+        "created_at": "2025-02-07T23:25:06.682843",
+        "updated_at": "2025-02-07T23:25:06.682843",
+        "__class__": "Place"
+    },
+    "Review.f2499d20-591b-48e0-9af1-b29c87ce5130": {
+        "id": "f2499d20-591b-48e0-9af1-b29c87ce5130",
+        "created_at": "2025-02-07T23:25:06.682847",
+        "updated_at": "2025-02-07T23:25:06.682847",
+        "__class__": "Review"
+    },
+    "State.ee8b31c8-a441-4aae-9ac8-4b9c0d43d443": {
+        "id": "ee8b31c8-a441-4aae-9ac8-4b9c0d43d443",
+        "created_at": "2025-02-07T23:25:06.682851",
+        "updated_at": "2025-02-07T23:25:06.682851",
+        "__class__": "State"
+    },
+    "User.db482086-a82a-46dd-808c-34d970c7015f": {
+        "id": "db482086-a82a-46dd-808c-34d970c7015f",
+        "created_at": "2025-02-07T23:25:06.682855",
+        "updated_at": "2025-02-07T23:25:06.682855",
+        "__class__": "User"
+    }
+}

models/base_model.py

@@ -3,13 +3,13 @@
 Contains class BaseModel
 """
 
-from datetime import datetime
-import models
+from datetime import datetime, timezone
 from os import getenv
 import sqlalchemy
 from sqlalchemy import Column, String, DateTime
 from sqlalchemy.ext.declarative import declarative_base
 import uuid
+import models
 
 time = "%Y-%m-%dT%H:%M:%S.%f"
 
@@ -23,8 +23,10 @@ class BaseModel:
     """The BaseModel class from which future classes will be derived"""
     if models.storage_t == "db":
         id = Column(String(60), primary_key=True)
-        created_at = Column(DateTime, default=datetime.utcnow)
-        updated_at = Column(DateTime, default=datetime.utcnow)
+        created_at = Column(
+            DateTime, default=lambda: datetime.now(timezone.utc))
+        updated_at = Column(
+            DateTime, default=lambda: datetime.now(timezone.utc))
 
     def __init__(self, *args, **kwargs):
         """Initialization of the base model"""
@@ -35,16 +37,17 @@ def __init__(self, *args, **kwargs):
             if kwargs.get("created_at", None) and type(self.created_at) is str:
                 self.created_at = datetime.strptime(kwargs["created_at"], time)
             else:
-                self.created_at = datetime.utcnow()
+                self.created_at = datetime.now(timezone.utc)
             if kwargs.get("updated_at", None) and type(self.updated_at) is str:
-                self.updated_at = datetime.strptime(kwargs["updated_at"], time)
+                self.updated_at = datetime.strptime(
+                    kwargs["updated_at"], time).replace(tzinfo=timezone.utc)
             else:
-                self.updated_at = datetime.utcnow()
+                self.updated_at = datetime.now(timezone.utc)
             if kwargs.get("id", None) is None:
                 self.id = str(uuid.uuid4())
         else:
             self.id = str(uuid.uuid4())
-            self.created_at = datetime.utcnow()
+            self.created_at = datetime.now(timezone.utc)
             self.updated_at = self.created_at
 
     def __str__(self):
@@ -54,7 +57,7 @@ def __str__(self):
 
     def save(self):
         """updates the attribute 'updated_at' with the current datetime"""
-        self.updated_at = datetime.utcnow()
+        self.updated_at = datetime.now(timezone.utc)
         models.storage.new(self)
         models.storage.save()
 

models/engine/db_storage.py

@@ -3,18 +3,16 @@
 Contains the class DBStorage
 """
 
-import models
+from os import getenv
+from sqlalchemy import create_engine
+from sqlalchemy.orm import scoped_session, sessionmaker
 from models.amenity import Amenity
-from models.base_model import BaseModel, Base
+from models.base_model import Base
 from models.city import City
 from models.place import Place
 from models.review import Review
 from models.state import State
 from models.user import User
-from os import getenv
-import sqlalchemy
-from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker
 
 classes = {"Amenity": Amenity, "City": City,
            "Place": Place, "Review": Review, "State": State, "User": User}
@@ -74,3 +72,23 @@ def reload(self):
     def close(self):
         """call remove() method on the private session attribute"""
         self.__session.remove()
+
+    def get(self, cls, id):
+        """Method to retrieve one object"""
+        for clss in classes:
+            if cls is classes[clss] or cls is clss:
+                objs = self.__session.query(classes[clss]).all()
+                for obj in objs:
+                    if id == obj.id:
+                        return (obj)
+        return None
+
+    def count(self, cls=None):
+        """count the number of objects in storage"""
+        count = 0
+        for clss in classes:
+            if cls is None or cls is classes[clss] or cls is clss:
+                objs = self.__session.query(classes[clss]).all()
+                for obj in objs:
+                    count += 1
+        return (count)

models/engine/file_storage.py

@@ -55,8 +55,10 @@ def reload(self):
                 jo = json.load(f)
             for key in jo:
                 self.__objects[key] = classes[jo[key]["__class__"]](**jo[key])
-        except:
+        except FileNotFoundError:
             pass
+        except json.JSONDecodeError as e:
+            print(f"Error loading JSON file: {e}")
 
     def delete(self, obj=None):
         """delete obj from __objects if it’s inside"""
@@ -68,3 +70,34 @@ def delete(self, obj=None):
     def close(self):
         """call reload() method for deserializing the JSON file to objects"""
         self.reload()
+
+    def get(self, cls, id):
+        """Method to retrieve one object"""
+        if isinstance(cls, str):
+            clss = classes[cls]
+        else:
+            clss = cls.__name__
+
+        for k, v in self.__objects.items():
+            class_name = k.split(".")[0]
+            class_id = k.split(".")[1]
+            if class_name == clss and class_id == id:
+                return v
+        return None
+
+    def count(self, cls=None):
+        """count the number of objects in storage"""
+        dict_classes = {}
+        count = 0
+        if cls is None:
+            dict_classes = classes
+        else:
+            if isinstance(cls, str):
+                dict_classes = classes[cls]
+            else:
+                dict_classes = cls.__name__
+
+        for obj in self.__objects:
+            if obj.split(".")[0] in dict_classes:
+                count += 1
+        return count

test_get_count.py

@@ -0,0 +1,11 @@
+#!/usr/bin/python3
+""" Test .get() and .count() methods
+"""
+from models import storage
+from models.state import State
+
+print("All objects: {}".format(storage.count()))
+print("State objects: {}".format(storage.count(State)))
+
+first_state_id = list(storage.all(State).values())[0].id
+print("First state: {}".format(storage.get(State, first_state_id)))