Now, you can instantly open this project on VSCode, with no installations and instant feedback from Rigobot (our internally developed AI). Choose one of the following vendors:
+ Now, you can instantly open this project on VSCode, with no installations and instant feedback from Rigobot
+ (our internally developed AI). Choose one of the following vendors:
+
+
-
-
- {% if buttons %}
- {% for button in buttons %}
-
- {{ button.label }}
-
- {% endfor %}
- {% else %}
-
No buttons available.
- {% endif %}
+
+
+
+
+
+
+
+
+
+
← Go back
+
+
+ Select your operating system
+
+
+
+
+
+
+
-
-
-
-
+
+
{% endblock %}
diff --git a/breathecode/provisioning/views.py b/breathecode/provisioning/views.py
index 4231ada18..bd13274d5 100644
--- a/breathecode/provisioning/views.py
+++ b/breathecode/provisioning/views.py
@@ -5,6 +5,7 @@
from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
import pandas as pd
+from capyc.rest_framework.exceptions import ValidationException
from circuitbreaker import CircuitBreakerError
from dateutil.relativedelta import relativedelta
from django.http import HttpResponse
@@ -35,9 +36,8 @@
from breathecode.utils.i18n import translation
from breathecode.utils.io.file import count_csv_rows
from breathecode.utils.views import private_view, render_message
-from capyc.rest_framework.exceptions import ValidationException
-from .actions import get_provisioning_vendor
+from .actions import get_provisioning_vendor, extract_repo_name
from .models import BILL_STATUS, ProvisioningBill, ProvisioningUserConsumption
@@ -99,33 +99,69 @@ def redirect_new_container(request, token):
def redirect_new_container_public(request):
+ from breathecode.registry.models import Asset
+
# user = token.user
+ lang = request.GET.get("lang", None)
repo = request.GET.get("repo", None)
if repo is None:
return render_message(request, "Please specify a repository in the URL")
urls = {"gitpod": "https://gitpod.io/#", "codespaces": "https://github.com/codespaces/new/?repo="}
- get_urls = {"codespaces": lambda x: x.replace("https://github.com/", "")}
+ url_modifiers = {"codespaces": lambda x: x.replace("https://github.com/", "")}
vendors = request.GET.get("vendor", "codespaces,gitpod").split(",")
buttons = []
- for v in vendors:
- if v not in urls:
- return render_message(request, f"Invalid provisioning vendor: {v}")
+ asset = Asset.objects.filter(readme_url__icontains=repo)
+ if lang is not None:
+ asset = asset.filter(lang=lang)
+ asset = asset.first()
+
+ if asset and asset.learnpack_deploy_url:
buttons.append(
{
- "label": f"Open in {v.capitalize()}",
- "url": (get_urls[v](urls[v]) if v in get_urls else urls[v] + repo),
- "icon": f"/static/img/{v}.svg",
+ "label": "Start now in the cloud",
+ "url": asset.learnpack_deploy_url,
+ "icon": "/static/img/learnpack.svg",
}
)
+ else:
+ for v in vendors:
+ if v not in urls:
+ return render_message(request, f"Invalid provisioning vendor: {v}")
+
+ _url = urls[v] + repo
+ if v in url_modifiers:
+ _url = urls[v] + url_modifiers[v](repo)
+
+ buttons.append(
+ {
+ "label": f"Open in {v.capitalize()}",
+ "url": _url,
+ "icon": f"/static/img/{v}.svg",
+ }
+ )
+
data = {
# 'title': item.academy.name,
"buttons": buttons,
# 'COMPANY_INFO_EMAIL': item.academy.feedback_email,
}
+
+ if asset and asset.url:
+ data["repo_url"] = asset.url + ".git"
+ data["repo_slug"] = extract_repo_name(asset.url)
+ else:
+ data["repo_url"] = "repo_url"
+ data["repo_slug"] = "repo_name"
+
+ if asset and asset.agent:
+ data["agent"] = asset.agent
+ else:
+ data["agent"] = "vscode"
+
template = get_template_content("choose_vendor", data)
return HttpResponse(template["html"])
diff --git a/breathecode/registry/actions.py b/breathecode/registry/actions.py
index e23f4aeec..71019ea97 100644
--- a/breathecode/registry/actions.py
+++ b/breathecode/registry/actions.py
@@ -779,6 +779,9 @@ def process_asset_config(asset, config):
asset.with_solutions = True
asset.with_video = True
+ if "agent" in config:
+ asset.agent = config["agent"]
+
if "solution" in config:
asset.with_solutions = True
if isinstance(config["solution"], str):
diff --git a/breathecode/registry/migrations/0044_asset_learnpack_deploy_url.py b/breathecode/registry/migrations/0044_asset_learnpack_deploy_url.py
new file mode 100644
index 000000000..0f4c7c5bf
--- /dev/null
+++ b/breathecode/registry/migrations/0044_asset_learnpack_deploy_url.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.1.1 on 2024-09-25 15:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("registry", "0043_asset_superseded_by"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="asset",
+ name="learnpack_deploy_url",
+ field=models.URLField(
+ blank=True,
+ default=None,
+ help_text="Only applies to LearnPack tutorials that have been published in the LearnPack cloud",
+ null=True,
+ ),
+ ),
+ ]
diff --git a/breathecode/registry/migrations/0045_asset_agent.py b/breathecode/registry/migrations/0045_asset_agent.py
new file mode 100644
index 000000000..983771806
--- /dev/null
+++ b/breathecode/registry/migrations/0045_asset_agent.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.1.1 on 2024-09-26 08:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("registry", "0044_asset_learnpack_deploy_url"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="asset",
+ name="agent",
+ field=models.CharField(
+ blank=True,
+ default=None,
+ help_text="If value is vscode, then we recommend to open this exercise/project in vscode and instructions will be different. If it is standalone, then you can open it directly from the terminal",
+ max_length=20,
+ null=True,
+ ),
+ ),
+ ]
diff --git a/breathecode/registry/models.py b/breathecode/registry/models.py
index bccf2ce08..b41624235 100644
--- a/breathecode/registry/models.py
+++ b/breathecode/registry/models.py
@@ -311,6 +311,13 @@ def __init__(self, *args, **kwargs):
help_text="Brief for the copywriters, mainly used to describe what this lessons needs to be about",
)
+ learnpack_deploy_url = models.URLField(
+ null=True,
+ blank=True,
+ default=None,
+ help_text="Only applies to LearnPack tutorials that have been published in the LearnPack cloud",
+ )
+
readme_url = models.URLField(
null=True,
blank=True,
@@ -346,6 +353,13 @@ def __init__(self, *args, **kwargs):
default=False,
help_text="If true, it means it can be opened on cloud provisioning vendors like Gitpod or Codespaces",
)
+ agent = models.CharField(
+ max_length=20,
+ null=True,
+ blank=True,
+ default=None,
+ help_text="If value is vscode, then we recommend to open this exercise/project in vscode and instructions will be different. If it is standalone, then you can open it directly from the terminal",
+ )
duration = models.IntegerField(null=True, blank=True, default=None, help_text="In hours")
difficulty = models.CharField(max_length=20, choices=DIFFICULTY, default=None, null=True, blank=True)
diff --git a/breathecode/registry/serializers.py b/breathecode/registry/serializers.py
index fdf0259b9..eaf0cfbcf 100644
--- a/breathecode/registry/serializers.py
+++ b/breathecode/registry/serializers.py
@@ -344,6 +344,7 @@ class AssetMidSerializer(AssetSerializer):
with_solutions = serpy.Field()
with_video = serpy.Field()
updated_at = serpy.Field()
+ agent = serpy.Field()
class AssetBigSerializer(AssetMidSerializer):
diff --git a/breathecode/services/activecampaign/actions/deal_add.py b/breathecode/services/activecampaign/actions/deal_add.py
index 9444a9a23..136913ec5 100644
--- a/breathecode/services/activecampaign/actions/deal_add.py
+++ b/breathecode/services/activecampaign/actions/deal_add.py
@@ -34,7 +34,9 @@ def deal_add(self, webhook, payload: dict, acp_ids):
if entry is None and "deal[contact_email]" in payload:
entry = (
FormEntry.objects.filter(
- email=payload["deal[contact_email]"], ac_deal_id__isnull=True, storage_status="PERSISTED"
+ email=payload["deal[contact_email]"],
+ ac_deal_id__isnull=True,
+ storage_status__in=["PERSISTED", "MANUALLY_PERSISTED"],
)
.order_by("-created_at")
.first()
diff --git a/breathecode/services/activecampaign/actions/deal_update.py b/breathecode/services/activecampaign/actions/deal_update.py
index b73fc5124..1f3bff869 100644
--- a/breathecode/services/activecampaign/actions/deal_update.py
+++ b/breathecode/services/activecampaign/actions/deal_update.py
@@ -31,7 +31,7 @@ def deal_update(ac_cls, webhook, payload: dict, acp_ids):
)
if entry is None and "deal[contact_email]" in payload:
entry = (
- FormEntry.objects.filter(email=payload["deal[contact_email]"], storage_status="PERSISTED")
+ FormEntry.objects.filter(email=payload["deal[contact_email]"], storage_status__in=["PERSISTED", "MANUALLY_PERSISTED"])
.order_by("-created_at")
.first()
)
diff --git a/breathecode/services/brevo.py b/breathecode/services/brevo.py
new file mode 100644
index 000000000..4d4bf1b41
--- /dev/null
+++ b/breathecode/services/brevo.py
@@ -0,0 +1,163 @@
+import logging
+
+import requests
+from requests.exceptions import JSONDecodeError
+
+logger = logging.getLogger(__name__)
+
+AC_MAPS = {
+ "email": "EMAIL",
+ "first_name": "FIRSTNAME",
+ "last_name": "LASTNAME",
+ "phone": "PHONE", # or "WHATSAPP", "SMS" depending on your needs
+ "utm_location": "UTM_LOCATION",
+ "utm_country": "COUNTRY",
+ "utm_campaign": "UTM_CAMPAIGN",
+ "utm_content": "UTM_CONTENT",
+ "utm_medium": "UTM_MEDIUM",
+ "utm_placement": "UTM_PLACEMENT",
+ "utm_term": "UTM_TERM",
+ "utm_source": "UTM_SOURCE",
+ "utm_plan": "PLAN",
+ "gender": "GENDER",
+ "course": "COURSE",
+ "gclid": "GCLID",
+ "utm_url": "CONVERSION_URL",
+ "utm_language": "LANGUAGE",
+ "utm_landing": "LANDING_URL",
+ "referral_key": "REFERRAL_KEY",
+ "client_comments": None, # It will be ignored because its none
+ "current_download": None, # It will be ignored because its none
+}
+
+
+def map_contact_keys(_contact):
+ # Check if all keys in contact exist in AC_MAPS
+ missing = []
+ for key in _contact:
+ if key not in AC_MAPS:
+ missing.append(key)
+
+ if len(missing) > 0:
+ _keys = ",".join(missing)
+ raise KeyError(f"The following keys are missing on AC_MAPS dictionary: '{_keys}'")
+
+ # Replace keys in the contact dictionary based on AC_MAPS
+ mapped_contact = {AC_MAPS[key]: value for key, value in _contact.items() if AC_MAPS[key] is not None}
+
+ return mapped_contact
+
+
+class BrevoAuthException(Exception):
+ pass
+
+
+class Brevo:
+ HOST = "https://api.brevo.com/v3"
+ headers = {}
+
+ def __init__(self, token=None, org=None, host=None):
+ self.token = token
+ self.org = org
+ self.page_size = 100
+ if host is not None:
+ self.HOST = host
+
+ def get(self, action_name, request_data=None):
+
+ if request_data is None:
+ request_data = {}
+
+ return self._call("GET", action_name, params=request_data)
+
+ def head(self, action_name, request_data=None):
+
+ if request_data is None:
+ request_data = {}
+
+ return self._call("HEAD", action_name, params=request_data)
+
+ def post(self, action_name, request_data=None):
+
+ if request_data is None:
+ request_data = {}
+
+ return self._call("POST", action_name, json=request_data)
+
+ def delete(self, action_name, request_data=None):
+
+ if request_data is None:
+ request_data = {}
+
+ return self._call("DELETE", action_name, params=request_data)
+
+ def _call(self, method_name, action_name, params=None, json=None):
+
+ self.headers = {
+ "api-key": self.token,
+ "Content-type": "application/json",
+ }
+
+ url = self.HOST + action_name
+ resp = requests.request(method=method_name, url=url, headers=self.headers, params=params, json=json, timeout=2)
+
+ if resp.status_code >= 200 and resp.status_code < 300:
+ if method_name in ["DELETE", "HEAD"]:
+ return resp
+
+ try:
+ data = resp.json()
+ return data
+ except JSONDecodeError:
+ payload = resp.text
+ return payload
+ else:
+ logger.debug(f"Error call {method_name}: /{action_name}")
+ if resp.status_code == 401:
+ raise BrevoAuthException("Invalid credentials when calling the Brevo API")
+
+ error_message = str(resp.status_code)
+ try:
+ error = resp.json()
+ error_message = error["message"]
+ logger.debug(error)
+ except Exception:
+ pass
+
+ raise Exception(
+ f"Unable to communicate with Brevo API for {method_name} {action_name}, error: {error_message}"
+ )
+
+ # def create_contact(self, email: str, contact: dict, lists: list):
+
+ # try:
+ # body = {
+ # "attributes": {
+ # **map_contact_keys(contact)
+ # },
+ # "updateEnabled": True,
+ # "email": email,
+ # "ext_id": attribution_id,
+ # "listIds": lists,
+ # }
+ # response = self.post("/contacts", request_data=body)
+ # return response.status_code == 201
+ # except Exception:
+ # return False
+
+ def create_contact(self, contact: dict, automation_slug):
+ try:
+ body = {
+ "event_name": "add_to_automation",
+ "identifiers": {"email_id": contact["email"]},
+ "contact_properties": {**map_contact_keys(contact)},
+ "event_properties": {
+ "automation_slug": automation_slug,
+ },
+ }
+ data = self.post("/events", request_data=body)
+ return data
+ except Exception as e:
+ logger.exception("Error while creating contact in Brevo")
+ raise e
+ # return False
diff --git a/breathecode/settings.py b/breathecode/settings.py
index 4e5f02bda..dcee1e5c9 100644
--- a/breathecode/settings.py
+++ b/breathecode/settings.py
@@ -78,6 +78,7 @@
"breathecode.commons",
"breathecode.payments",
"breathecode.provisioning",
+ "breathecode.websocket",
"explorer",
"graphene_django",
"task_manager",
@@ -525,6 +526,14 @@ def get(self, key, *args, **kwargs):
# Websocket
ASGI_APPLICATION = "breathecode.asgi.application"
REDIS_URL_PATTERN = r"^redis://(.+):(\d+)$"
+CHANNEL_LAYERS = {
+ "default": {
+ "BACKEND": "channels_redis.pubsub.RedisPubSubChannelLayer",
+ "CONFIG": {
+ "hosts": [("127.0.0.1", 6379)],
+ },
+ },
+}
heroku_redis_ssl_host = {
"address": REDIS_URL, # The 'rediss' schema denotes a SSL connection.
diff --git a/breathecode/static/img/button-locally.svg b/breathecode/static/img/button-locally.svg
new file mode 100644
index 000000000..cca688223
--- /dev/null
+++ b/breathecode/static/img/button-locally.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/breathecode/static/img/chevron.svg b/breathecode/static/img/chevron.svg
new file mode 100644
index 000000000..7a5723d9c
--- /dev/null
+++ b/breathecode/static/img/chevron.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/breathecode/static/img/learnpack.svg b/breathecode/static/img/learnpack.svg
new file mode 100644
index 000000000..889b92970
--- /dev/null
+++ b/breathecode/static/img/learnpack.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/breathecode/static/img/os-ios.svg b/breathecode/static/img/os-ios.svg
new file mode 100644
index 000000000..4cc9b2a10
--- /dev/null
+++ b/breathecode/static/img/os-ios.svg
@@ -0,0 +1,3 @@
+
+
diff --git a/breathecode/static/img/os-linux.svg b/breathecode/static/img/os-linux.svg
new file mode 100644
index 000000000..7fa16460b
--- /dev/null
+++ b/breathecode/static/img/os-linux.svg
@@ -0,0 +1,472 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/breathecode/static/img/os-windows.svg b/breathecode/static/img/os-windows.svg
new file mode 100644
index 000000000..2a83a8ef2
--- /dev/null
+++ b/breathecode/static/img/os-windows.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/breathecode/static/img/provisioning.png b/breathecode/static/img/provisioning.png
new file mode 100644
index 000000000..853388fe9
Binary files /dev/null and b/breathecode/static/img/provisioning.png differ
diff --git a/breathecode/websocket/__init__.py b/breathecode/websocket/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/breathecode/websocket/admin.py b/breathecode/websocket/admin.py
new file mode 100644
index 000000000..846f6b406
--- /dev/null
+++ b/breathecode/websocket/admin.py
@@ -0,0 +1 @@
+# Register your models here.
diff --git a/breathecode/websocket/apps.py b/breathecode/websocket/apps.py
new file mode 100644
index 000000000..1a260a7bc
--- /dev/null
+++ b/breathecode/websocket/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class WebsocketConfig(AppConfig):
+ default_auto_field = "django.db.models.BigAutoField"
+ name = "breathecode.websocket"
diff --git a/breathecode/websocket/consumers.py b/breathecode/websocket/consumers.py
new file mode 100644
index 000000000..c71f8c428
--- /dev/null
+++ b/breathecode/websocket/consumers.py
@@ -0,0 +1,47 @@
+# chat/consumers.py
+from channels.generic.websocket import AsyncJsonWebsocketConsumer
+
+# from channels.layers import ChannelLayerManager
+from channels_redis.pubsub import RedisPubSubChannelLayer
+
+
+class NotificationConsumer(AsyncJsonWebsocketConsumer):
+ channel_layer: RedisPubSubChannelLayer
+
+ async def connect(self):
+ # self.room_name = self.scope["url_route"]["kwargs"]["room_name"]
+ self.user_group_name = f"notification_{self.user_id}"
+ self.academy_group_name = f"notification_{self.user_id}_{self.academy_id}"
+
+ self.user_id = 1
+ self.academy_id = 1
+
+ # Join room group
+ await self.channel_layer.group_add(self.user_group_name, self.channel_name)
+ await self.channel_layer.group_add(f"notification_{self.user_id}_{self.academy_id}", self.channel_name)
+
+ await self.accept()
+
+ async def disconnect(self, close_code):
+
+ await self.channel_layer.group_discard(f"notification_{self.user_id}", self.channel_name)
+ await self.channel_layer.group_discard(f"notification_{self.user_id}_{self.academy_id}", self.channel_name)
+ ...
+ # # Leave room group
+ # await self.channel_layer.group_discard(self.room_group_name, self.channel_name)
+
+ # Receive message from WebSocket
+ async def receive_json(self, content):
+ ...
+ # text_data_json = json.loads(text_data)
+ # message = text_data_json["message"]
+
+ # # Send message to room group
+ # await self.channel_layer.group_send(self.room_group_name, {"type": "chat.message", "message": message})
+
+ # Receive message from room group
+ async def chat_message(self, event):
+ message = event["message"]
+
+ # Send message to WebSocket
+ await self.send_json({"message": message})
diff --git a/breathecode/websocket/migrations/__init__.py b/breathecode/websocket/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/breathecode/websocket/models.py b/breathecode/websocket/models.py
new file mode 100644
index 000000000..6b2021999
--- /dev/null
+++ b/breathecode/websocket/models.py
@@ -0,0 +1 @@
+# Create your models here.
diff --git a/breathecode/websocket/router.py b/breathecode/websocket/router.py
new file mode 100644
index 000000000..bbf6a2883
--- /dev/null
+++ b/breathecode/websocket/router.py
@@ -0,0 +1,17 @@
+from channels.auth import AuthMiddlewareStack
+from channels.routing import URLRouter
+from channels.security.websocket import AllowedHostsOriginValidator
+
+from django.urls import path
+
+from .consumers import NotificationConsumer
+
+routes = AllowedHostsOriginValidator(
+ AuthMiddlewareStack(
+ URLRouter(
+ [
+ path("ws/notification", NotificationConsumer.as_asgi(), name="ws_notification"),
+ ]
+ )
+ )
+)
diff --git a/breathecode/websocket/tests.py b/breathecode/websocket/tests.py
new file mode 100644
index 000000000..a39b155ac
--- /dev/null
+++ b/breathecode/websocket/tests.py
@@ -0,0 +1 @@
+# Create your tests here.
diff --git a/breathecode/websocket/views.py b/breathecode/websocket/views.py
new file mode 100644
index 000000000..60f00ef0e
--- /dev/null
+++ b/breathecode/websocket/views.py
@@ -0,0 +1 @@
+# Create your views here.
diff --git a/scripts/dyno/web.sh b/scripts/dyno/web.sh
index 296170bbb..aacd00e2f 100755
--- a/scripts/dyno/web.sh
+++ b/scripts/dyno/web.sh
@@ -2,7 +2,6 @@
WEB_WORKER_CONNECTION=${WEB_WORKER_CONNECTION:-200}
# uvicorn_worker.UvicornWorker is incompatible with new relic
-uvicorn.workers.UvicornWorker
WEB_WORKER_CLASS=${WEB_WORKER_CLASS:-uvicorn.workers.UvicornWorker}
CELERY_POOL=${CELERY_POOL:-prefork}
WEB_WORKERS=${WEB_WORKERS:-2}
diff --git a/test_settings.py b/test_settings.py
index a8efe3536..7a67f602d 100644
--- a/test_settings.py
+++ b/test_settings.py
@@ -23,3 +23,5 @@
CACHE_MIDDLEWARE_SECONDS = 60 * int(os.getenv("CACHE_MIDDLEWARE_MINUTES", 120))
SECURE_SSL_REDIRECT = False
+
+CHANNEL_LAYERS = {"default": {"BACKEND": "channels.layers.InMemoryChannelLayer"}}
+ 
+ 
+ 
+