Refactor application tag references to name

- Updated `clear_test_apps.py` to check for '_test' in app name instead of tag.
- Fixed import order in `squarecloud/__init__.py`.
- Modified `squarecloud/app.py` to replace 'tag' with 'name' and removed 'isWebsite'.
- Updated CLI tables in `squarecloud/cli/app.py` and `squarecloud/cli/main.py` to display app name.
- Adjusted `Client` class in `squarecloud/client.py` for consistency in handling 'lang' and 'name' fields.
- Revised data classes in `squarecloud/data.py` to use 'name' instead of 'tag' and removed 'isWebsite'.
- Corrected file info class in `squarecloud/data.py` to set a default size of 0.0.
- Updated listener manager in `squarecloud/listeners/capture_listener.py` to reference app name.

Author: robert-nogueira

scripts/clear_test_apps.py

@@ -12,9 +12,9 @@
 @run_async_script
 async def delete_test_apps():
     for app in await client.all_apps():
-        if '_test' in app.tag:
+        if '_test' in app.name:
             await app.delete()
-            print(f'\U0001F5D1 Deleted app {app.tag}, with id {app.id}...')
+            print(f'\U0001F5D1 Deleted app {app.name}, with id {app.id}...')
 
 
 if __name__ == '__main__':

squarecloud/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from . import errors, utils
-from .client import Client
 from .app import Application
+from .client import Client
 from .data import (
     AppData,
     BackupData,

squarecloud/app.py

@@ -152,12 +152,13 @@ class Application(CaptureListenerManager):
         '_data',
         'cache',
         '_id',
-        '_tag',
+        '_name',
         '_desc',
+        '_domain',
+        '_custom',
         '_ram',
         '_lang',
         '_cluster',
-        '_isWebsite',
         'always_avoid_listeners',
     ]
 
@@ -166,11 +167,12 @@ def __init__(
         client: 'Client',
         http: HTTPClient,
         id: str,
-        tag: str,
+        name: str,
         ram: PositiveInt,
         lang: str,
         cluster: str,
-        isWebsite: bool,
+        domain: str | None,
+        custom: str | None,
         desc: str | None = None,
     ) -> None:
         """
@@ -184,22 +186,24 @@ def __init__(
         this app.
         :param http: Store a reference to the HTTPClient
         :param id: The application id
-        :param tag: The tag of the app
+        :param name: The tag of the app
         :param ram: The amount of ram that is allocated
         :param lang: The programming language of the app
         :param cluster: The cluster that the app is hosted on
-        :param isWebsite: Whether if the app is a website
         :param desc: Define the description of the app
+        :param domain: Define the domain of the app
+        :param custom: Define the custom domain of the app
 
         :return: None
         """
         self._id: str = id
-        self._tag: str = tag
+        self._name: str = name
+        self._domain: str | None = domain
+        self._custom: str | None = custom
         self._desc: str | None = desc
         self._ram: PositiveInt = ram
         self._lang: str = lang
         self._cluster: str = cluster
-        self._isWebsite: bool = isWebsite
         self._client: 'Client' = client
         self._http: HTTPClient = http
         self._listener: CaptureListenerManager = CaptureListenerManager()
@@ -243,14 +247,14 @@ def id(self) -> str:
         return self._id
 
     @property
-    def tag(self) -> str:
+    def name(self) -> str:
         """
         The tag function is a property that returns the application tag.
 
         :return: The tag of the application
         :rtype: str
         """
-        return self._tag
+        return self._name
 
     @property
     def desc(self) -> str | None:
@@ -275,9 +279,7 @@ def ram(self) -> int:
         return self._ram
 
     @property
-    def lang(
-        self,
-    ) -> str:
+    def lang(self) -> str:
         """
         The lang function is a property that returns the application's
         programing language.
@@ -288,9 +290,7 @@ def lang(
         return self._lang
 
     @property
-    def cluster(
-        self,
-    ) -> str:
+    def cluster(self) -> str:
         """
         The cluster function is a property that returns the
         cluster that the application is
@@ -303,15 +303,28 @@ def cluster(
         return self._cluster
 
     @property
-    def is_website(self) -> bool:
+    def domain(self) -> str | None:
+        """
+        The domain function is a property that returns the
+        application's domain.
+
+
+        :return: The application's domain
+        :rtype: str | None
         """
-        The is_website function is a property that returns a boolean value
-        indicating whether th application is a website.
+        return self._domain
 
-        :return: A boolean value, true or false
-        :rtype: bool
+    @property
+    def custom(self) -> str | None:
+        """
+        The custom function is a property that returns the
+        application's custom domain.
+
+
+        :return: The application's domain
+        :rtype: str | None
         """
-        return self._isWebsite
+        return self._custom
 
     @staticmethod
     def _notify_listener(endpoint: Endpoint):

squarecloud/cli/app.py

@@ -53,12 +53,11 @@ async def app_group(ctx: Context, app_id: str, token: str):
         with Console().status('loading'):
             app = await client.app(app_id)
             table = Table(title=app.tag, header_style='purple')
-            table.add_column('Tag', justify='center')
+            table.add_column('Name', justify='center')
             table.add_column('ID', justify='center')
             table.add_column('RAM', justify='center')
             table.add_column('Language', justify='center')
             table.add_column('Description', justify='center')
-            table.add_column('Is Website', justify='center')
             table.add_column('Cluster', justify='center')
 
             table.add_row(
@@ -128,7 +127,7 @@ async def app_list(ctx: Context, token: str):
         return
     table = Table(title='App List', header_style='purple')
 
-    table.add_column('Tag', justify='center')
+    table.add_column('Name', justify='center')
     table.add_column('ID', justify='center')
     table.add_column('RAM', justify='center')
     table.add_column('Language', justify='center')

squarecloud/cli/main.py

@@ -127,9 +127,7 @@ def create_config(
             default='Y',
         )
     if r:
-        path = prompt(
-            'where do you want to save the file', default='.'
-        )
+        path = prompt('where do you want to save the file', default='.')
         config_file.save(path)
         print(
             Panel(

squarecloud/client.py

@@ -412,6 +412,9 @@ async def app(self, app_id: str, **_kwargs) -> Application:
         if not app_data:
             raise ApplicationNotFound(app_id=app_id)
         app_data = app_data.pop()
+        app_data['language'] = app_data.pop('lang')
+        app_data = AppData(**app_data).to_dict()
+        app_data['lang'] = app_data.pop('language')
         return Application(client=self, http=self._http, **app_data)
 
     @_notify_listener(Endpoint.user())
@@ -433,10 +436,12 @@ async def all_apps(self, **_kwargs) -> list[Application]:
         response: Response = await self._http.fetch_user_info()
         payload = response.response
         apps_data: list = payload['applications']
-        apps: list[Application] = [
-            Application(client=self, http=self._http, **data)
-            for data in apps_data
-        ]
+        apps: list[Application] = []
+        for data in apps_data:
+            data['language'] = data.pop('lang')
+            data = AppData(**data).to_dict()
+            data['lang'] = data.pop('language')
+            apps.append(Application(client=self, http=self._http, **data))
         return apps
 
     @_notify_listener(Endpoint.upload())

squarecloud/data.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Dict, Literal
+from typing import Any, Dict, Literal, Optional
 
 from pydantic import confloat, conint
 from pydantic.dataclasses import dataclass
@@ -88,15 +88,12 @@ class AppData:
     :ivar cluster: The cluster that the app is hosted on
     :ivar ram: The amount of RAM that application is using
     :ivar language The programming language of the app.:
-    :ivar isWebsite: Whether if the app is a website
 
     :type id: str
     :type name: str
     :type cluster: str
     :type ram: confloat(ge=0);
     :type language: Language
-    :type isWebsite: bool
-    :type gitIntegration: bool
     :type domain: str | None = None
     :type custom: str | None = None
     :type desc: str | None = None
@@ -106,10 +103,8 @@ class AppData:
     name: str
     cluster: str
     ram: confloat(ge=0)
-    language: str
+    language: Optional[str]
     cluster: str
-    isWebsite: bool
-    gitIntegration: bool
     domain: str | None = None
     custom: str | None = None
     desc: str | None = None
@@ -124,18 +119,18 @@ class UserData:
     User data class
 
     :ivar id: User ID;
-    :ivar tag: Username
+    :ivar name: Username
     :ivar plan: User plan
     :ivar email: User email
 
     :type id: conint(ge=0)
-    :type tag: str
+    :type name: str
     :type plan: PlanData
     :type email: str | None = None
     """
 
     id: conint(ge=0)
-    tag: str
+    name: str
     plan: PlanData
     email: str | None = None
 
@@ -223,15 +218,15 @@ class UploadData:
     Upload data class
 
     :ivar id: ID of the uploaded application
-    :ivar tag: Tag of the uploaded application
+    :ivar name: Tag of the uploaded application
     :ivar language: Programming language of the uploaded application
     :ivar ram: Ram allocated for the uploaded application
     :ivar cpu: Cpu of the uploaded application
     :ivar description: Description of the uploaded application
     :ivar subdomain: Subdomain of the uploaded application (only in websites)
 
     :type id: str
-    :type tag: str
+    :type name: str
     :type language: Language
     :type ram: confloat(ge=0)
     :type cpu: confloat(ge=0)
@@ -240,7 +235,7 @@ class UploadData:
     """
 
     id: str
-    tag: str
+    name: str
     language: Language
     ram: confloat(ge=0)
     cpu: confloat(ge=0)
@@ -272,9 +267,9 @@ class FileInfo:
     app_id: str
     type: Literal['file', 'directory']
     name: str
-    size: confloat(ge=0)
     lastModified: conint(ge=0) | float
     path: str
+    size: confloat(ge=0.0) = 0.0
 
     def to_dict(self):
         return self.__dict__.copy()

squarecloud/listeners/capture_listener.py

@@ -94,7 +94,7 @@ def filter_annotations(annotations: list[Any]) -> Any:
             kwargs['extra'] = extra
         info_msg: str = (
             f'ENDPOINT: {listener.endpoint}\n'
-            f'APP-TAG: {listener.app.tag}\n'
+            f'APP-TAG: {listener.app.name}\n'
             f'APP-ID: {listener.app.id}'
         )
         if extra: