From 0716acf714c8fda34ae63f04131f66f1f826bb91 Mon Sep 17 00:00:00 2001 From: jingrow Date: Sun, 21 Sep 2025 22:22:04 +0800 Subject: [PATCH] =?UTF-8?q?Document=E6=9B=BF=E6=8D=A2=E4=B8=BAPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jcloud/api/client.py | 2 +- .../pagetype/referral_bonus/referral_bonus.py | 4 ++-- .../pagetype/ssh_access_audit/ssh_access_audit.py | 4 ++-- .../ssh_access_audit_host.py | 4 ++-- .../ssh_access_audit_violation.py | 4 ++-- .../virtual_disk_resize/virtual_disk_resize.py | 4 ++-- .../virtual_machine_migration.py | 4 ++-- .../virtual_machine_migration_bind_mount.py | 4 ++-- .../virtual_machine_migration_mount.py | 4 ++-- .../virtual_machine_migration_step.py | 4 ++-- .../virtual_machine_migration_volume.py | 4 ++-- .../virtual_machine_replacement.py | 4 ++-- .../pagetype/account_request/account_request.py | 4 ++-- .../account_request_jcloud_role.py | 4 ++-- .../pagetype/add_on_settings/add_on_settings.py | 4 ++-- jcloud/jcloud/pagetype/agent_job/agent_job.py | 4 ++-- .../pagetype/agent_job_step/agent_job_step.py | 4 ++-- .../pagetype/agent_job_type/agent_job_type.py | 4 ++-- .../agent_job_type_step/agent_job_type_step.py | 4 ++-- .../agent_request_failure.py | 4 ++-- .../alertmanager_webhook_log.py | 4 ++-- .../alertmanager_webhook_log_reaction_job.py | 4 ++-- .../alipay_payment_record.py | 4 ++-- .../pagetype/ansible_console/ansible_console.py | 4 ++-- .../ansible_console_log/ansible_console_log.py | 4 ++-- .../ansible_console_output.py | 4 ++-- .../jcloud/pagetype/ansible_play/ansible_play.py | 4 ++-- .../jcloud/pagetype/ansible_task/ansible_task.py | 4 ++-- jcloud/jcloud/pagetype/app/app.py | 4 ++-- jcloud/jcloud/pagetype/app_group/app_group.py | 4 ++-- jcloud/jcloud/pagetype/app_patch/app_patch.py | 4 ++-- jcloud/jcloud/pagetype/app_release/app_release.py | 4 ++-- .../app_release_approval_request.py | 4 ++-- .../app_release_difference.py | 4 ++-- jcloud/jcloud/pagetype/app_rename/app_rename.py | 4 ++-- jcloud/jcloud/pagetype/app_source/app_source.py | 4 ++-- .../app_source_version/app_source_version.py | 4 ++-- jcloud/jcloud/pagetype/app_tag/app_tag.py | 4 ++-- jcloud/jcloud/pagetype/audit_log/audit_log.py | 4 ++-- .../aws_savings_plan_recommendation.py | 4 ++-- .../pagetype/backup_bucket/backup_bucket.py | 4 ++-- .../backup_restoration_test.py | 4 ++-- .../balance_transaction/balance_transaction.py | 4 ++-- .../balance_transaction_allocation.py | 4 ++-- jcloud/jcloud/pagetype/bench/bench.py | 4 ++-- jcloud/jcloud/pagetype/bench_app/bench_app.py | 4 ++-- .../pagetype/bench_dependency/bench_dependency.py | 4 ++-- .../bench_dependency_version.py | 4 ++-- .../bench_get_app_cache/bench_get_app_cache.py | 6 +++--- jcloud/jcloud/pagetype/bench_mount/bench_mount.py | 4 ++-- jcloud/jcloud/pagetype/bench_shell/bench_shell.py | 4 ++-- .../pagetype/bench_shell_log/bench_shell_log.py | 4 ++-- .../bench_site_update/bench_site_update.py | 4 ++-- .../jcloud/pagetype/bench_update/bench_update.py | 4 ++-- .../pagetype/bench_update_app/bench_update_app.py | 4 ++-- .../pagetype/bench_variable/bench_variable.py | 4 ++-- .../pagetype/blocked_domain/blocked_domain.py | 4 ++-- .../build_cache_shell/build_cache_shell.py | 4 ++-- .../certificate_authority.py | 4 ++-- .../child_team_member/child_team_member.py | 4 ++-- .../jcloud/pagetype/cloud_region/cloud_region.py | 4 ++-- jcloud/jcloud/pagetype/cluster/cluster.py | 4 ++-- jcloud/jcloud/pagetype/code_server/code_server.py | 4 ++-- .../communication_email/communication_email.py | 4 ++-- .../cookie_preference_log.py | 4 ++-- .../currency_exchange/currency_exchange.py | 4 ++-- .../pagetype/dashboard_banner/dashboard_banner.py | 4 ++-- .../database_server_mariadb_variable.py | 4 ++-- jcloud/jcloud/pagetype/deploy/deploy.py | 4 ++-- .../jcloud/pagetype/deploy_bench/deploy_bench.py | 4 ++-- .../pagetype/deploy_candidate/deploy_candidate.py | 4 ++-- .../deploy_candidate/deploy_notifications.py | 4 ++-- .../deploy_candidate_app/deploy_candidate_app.py | 4 ++-- .../deploy_candidate_build_step.py | 4 ++-- .../deploy_candidate_dependency.py | 4 ++-- .../deploy_candidate_difference.py | 4 ++-- .../deploy_candidate_difference_app.py | 4 ++-- .../deploy_candidate_package.py | 4 ++-- .../deploy_candidate_variable.py | 4 ++-- .../pagetype/dns_resolution/dns_resolution.py | 4 ++-- .../jcloud/pagetype/domain_owner/domain_owner.py | 4 ++-- jcloud/jcloud/pagetype/drip_email/drip_email.py | 4 ++-- .../pagetype/firewall_rules/firewall_rules.py | 4 ++-- .../github_webhook_log/github_webhook_log.py | 4 ++-- .../pagetype/incident_alerts/incident_alerts.py | 4 ++-- .../incident_settings/incident_settings.py | 4 ++-- .../incident_settings_self_hosted_user.py | 4 ++-- .../incident_settings_user.py | 4 ++-- .../incident_suggestion/incident_suggestion.py | 4 ++-- .../pagetype/incident_updates/incident_updates.py | 4 ++-- jcloud/jcloud/pagetype/invoice/invoice.py | 4 ++-- .../invoice_credit_allocation.py | 4 ++-- .../pagetype/invoice_discount/invoice_discount.py | 4 ++-- .../jcloud/pagetype/invoice_item/invoice_item.py | 4 ++-- .../invoice_transaction_fee.py | 4 ++-- .../pagetype/jcloud_feedback/jcloud_feedback.py | 4 ++-- jcloud/jcloud/pagetype/jcloud_job/jcloud_job.py | 4 ++-- .../pagetype/jcloud_job_step/jcloud_job_step.py | 4 ++-- .../pagetype/jcloud_job_type/jcloud_job_type.py | 4 ++-- .../jcloud_job_type_step/jcloud_job_type_step.py | 4 ++-- .../jcloud_method_permission.py | 4 ++-- .../jcloud_notification/jcloud_notification.py | 4 ++-- .../jcloud_permission_group.py | 4 ++-- .../jcloud_permission_group_user.py | 4 ++-- jcloud/jcloud/pagetype/jcloud_role/jcloud_role.py | 6 +++--- .../jcloud_role_permission.py | 4 ++-- .../pagetype/jcloud_role_user/jcloud_role_user.py | 4 ++-- .../pagetype/jcloud_settings/jcloud_settings.py | 4 ++-- jcloud/jcloud/pagetype/jcloud_tag/jcloud_tag.py | 4 ++-- .../jcloud_user_permission.py | 4 ++-- .../pagetype/jcloud_webhook/jcloud_webhook.py | 4 ++-- .../jcloud_webhook_attempt.py | 4 ++-- .../jcloud_webhook_event/jcloud_webhook_event.py | 4 ++-- .../jcloud_webhook_log/jcloud_webhook_log.py | 4 ++-- .../jcloud_webhook_selected_event.py | 4 ++-- jcloud/jcloud/pagetype/jerp_app/jerp_app.py | 4 ++-- .../pagetype/jerp_consultant/jerp_consultant.py | 4 ++-- .../jerp_consultant_region.py | 4 ++-- .../jerp_site_settings/jerp_site_settings.py | 4 ++-- .../pagetype/jingrow_version/jingrow_version.py | 4 ++-- .../jingrow_version_dependency.py | 4 ++-- .../jcloud/pagetype/jsite_domain/jsite_domain.py | 4 ++-- .../jcloud/pagetype/jsite_server/jsite_server.py | 4 ++-- jcloud/jcloud/pagetype/log_counter/log_counter.py | 4 ++-- jcloud/jcloud/pagetype/mail_log/mail_log.py | 4 ++-- jcloud/jcloud/pagetype/mail_setup/mail_setup.py | 4 ++-- .../jcloud/pagetype/malware_scan/malware_scan.py | 4 ++-- .../managed_database_service.py | 4 ++-- .../pagetype/mariadb_stalk/mariadb_stalk.py | 4 ++-- .../mariadb_stalk_diagnostic.py | 4 ++-- .../pagetype/mariadb_variable/mariadb_variable.py | 4 ++-- .../marketplace_app_categories.py | 4 ++-- .../marketplace_app_category.py | 4 ++-- .../marketplace_app_screenshot.py | 4 ++-- .../marketplace_app_version.py | 4 ++-- .../marketplace_localisation_app.py | 4 ++-- .../module_setup_guide/module_setup_guide.py | 4 ++-- .../mpesa_payment_record/mpesa_payment_record.py | 4 ++-- .../mpesa_request_log/mpesa_request_log.py | 4 ++-- jcloud/jcloud/pagetype/mpesa_setup/mpesa_setup.py | 4 ++-- .../oauth_domain_mapping/oauth_domain_mapping.py | 4 ++-- jcloud/jcloud/pagetype/order/order.py | 4 ++-- .../jcloud/pagetype/partner_lead/partner_lead.py | 4 ++-- .../partner_payment_payout.py | 4 ++-- .../partner_payment_payout_item.py | 4 ++-- .../pagetype/payment_dispute/payment_dispute.py | 4 ++-- .../pagetype/payment_gateway/payment_gateway.py | 4 ++-- .../payment_partner_transaction.py | 4 ++-- .../jcloud/pagetype/payout_order/payout_order.py | 4 ++-- .../payout_order_item/payout_order_item.py | 4 ++-- .../physical_backup_group.py | 4 ++-- .../physical_backup_group_site.py | 4 ++-- .../physical_backup_restoration.py | 4 ++-- .../physical_backup_restoration_step.py | 4 ++-- .../physical_restoration_test.py | 4 ++-- .../physical_restoration_test_result.py | 4 ++-- jcloud/jcloud/pagetype/plan_change/plan_change.py | 4 ++-- .../jcloud/pagetype/plan_feature/plan_feature.py | 4 ++-- .../prometheus_alert_rule.py | 4 ++-- .../prometheus_alert_rule_cluster.py | 4 ++-- .../proxy_server_domain/proxy_server_domain.py | 4 ++-- .../razorpay_payment_record.py | 4 ++-- .../razorpay_webhook_log/razorpay_webhook_log.py | 4 ++-- jcloud/jcloud/pagetype/region/region.py | 4 ++-- .../pagetype/release_group/release_group.py | 4 ++-- .../release_group_app/release_group_app.py | 4 ++-- .../release_group_dependency.py | 4 ++-- .../release_group_mount/release_group_mount.py | 4 ++-- .../release_group_package.py | 4 ++-- .../release_group_server/release_group_server.py | 4 ++-- .../release_group_variable.py | 4 ++-- jcloud/jcloud/pagetype/remote_file/remote_file.py | 4 ++-- .../remote_operation_log/remote_operation_log.py | 4 ++-- .../jcloud/pagetype/resource_tag/resource_tag.py | 4 ++-- jcloud/jcloud/pagetype/root_domain/root_domain.py | 4 ++-- .../scheduled_auto_update_log.py | 4 ++-- .../pagetype/security_update/security_update.py | 4 ++-- .../security_update_check.py | 4 ++-- .../self_hosted_server/self_hosted_server.py | 4 ++-- .../self_hosted_site_apps.py | 4 ++-- .../serial_console_log/serial_console_log.py | 4 ++-- jcloud/jcloud/pagetype/server/server.py | 4 ++-- .../jcloud/pagetype/server_mount/server_mount.py | 4 ++-- .../pagetype/silenced_alert/silenced_alert.py | 4 ++-- jcloud/jcloud/pagetype/site/site.py | 6 +++--- .../pagetype/site_activity/site_activity.py | 4 ++-- .../pagetype/site_analytics/site_analytics.py | 4 ++-- .../site_analytics_active.py | 4 ++-- .../site_analytics_app/site_analytics_app.py | 4 ++-- .../site_analytics_login/site_analytics_login.py | 4 ++-- .../site_analytics_pagetype.py | 4 ++-- .../site_analytics_user/site_analytics_user.py | 4 ++-- jcloud/jcloud/pagetype/site_app/site_app.py | 4 ++-- jcloud/jcloud/pagetype/site_backup/site_backup.py | 4 ++-- jcloud/jcloud/pagetype/site_config/site_config.py | 4 ++-- .../pagetype/site_config_key/site_config_key.py | 4 ++-- .../site_config_key_blacklist.py | 4 ++-- .../site_database_table_permission.py | 4 ++-- .../site_database_user/site_database_user.py | 4 ++-- jcloud/jcloud/pagetype/site_domain/site_domain.py | 4 ++-- .../site_group_deploy/site_group_deploy.py | 4 ++-- .../site_group_deploy_app.py | 4 ++-- .../pagetype/site_migration/site_migration.py | 4 ++-- .../site_migration_step/site_migration_step.py | 4 ++-- jcloud/jcloud/pagetype/site_plan/plan.py | 4 ++-- .../site_plan_allowed_app.py | 4 ++-- .../pagetype/site_plan_change/site_plan_change.py | 4 ++-- .../site_plan_release_group.py | 4 ++-- .../pagetype/site_replication/site_replication.py | 8 ++++---- jcloud/jcloud/pagetype/site_update/site_update.py | 4 ++-- jcloud/jcloud/pagetype/site_usage/site_usage.py | 4 ++-- jcloud/jcloud/pagetype/site_user/site_user.py | 4 ++-- .../site_user_session/site_user_session.py | 4 ++-- .../sql_playground_log/sql_playground_log.py | 4 ++-- .../pagetype/ssh_certificate/ssh_certificate.py | 4 ++-- .../ssh_certificate_authority.py | 4 ++-- jcloud/jcloud/pagetype/ssh_key/ssh_key.py | 4 ++-- .../storage_integration_bucket.py | 4 ++-- .../storage_integration_subscription.py | 4 ++-- .../stripe_micro_charge_record.py | 4 ++-- .../stripe_payment_event/stripe_payment_event.py | 4 ++-- .../stripe_payment_method.py | 4 ++-- .../stripe_webhook_log/stripe_webhook_log.py | 4 ++-- .../jcloud/pagetype/subscription/subscription.py | 4 ++-- jcloud/jcloud/pagetype/team/team.py | 4 ++-- jcloud/jcloud/pagetype/team_change/team_change.py | 4 ++-- jcloud/jcloud/pagetype/team_member/team_member.py | 4 ++-- .../team_member_deletion_request.py | 4 ++-- .../team_member_impersonation.py | 4 ++-- .../pagetype/team_onboarding/team_onboarding.py | 4 ++-- .../pagetype/telegram_group/telegram_group.py | 4 ++-- .../telegram_group_topic/telegram_group_topic.py | 4 ++-- .../pagetype/telegram_message/telegram_message.py | 4 ++-- .../pagetype/tls_certificate/tls_certificate.py | 4 ++-- .../jcloud/pagetype/usage_record/usage_record.py | 4 ++-- jcloud/jcloud/pagetype/user_2fa/user_2fa.py | 4 ++-- .../user_ssh_certificate/user_ssh_certificate.py | 4 ++-- .../jcloud/pagetype/user_ssh_key/user_ssh_key.py | 4 ++-- .../pagetype/version_upgrade/version_upgrade.py | 8 ++++---- .../virtual_disk_snapshot.py | 4 ++-- .../pagetype/virtual_machine/virtual_machine.py | 15 ++++++++------- .../virtual_machine_image.py | 4 ++-- .../virtual_machine_image_volume.py | 4 ++-- .../virtual_machine_temporary_volume.py | 4 ++-- .../virtual_machine_volume.py | 4 ++-- .../wechatpay_payment_record.py | 4 ++-- .../pagetype/wireguard_peer/wireguard_peer.py | 4 ++-- .../pagetype/app_plan_version/app_plan_version.py | 4 ++-- .../app_release_approval_code_comments.py | 4 ++-- .../pagetype/app_user_review/app_user_review.py | 4 ++-- .../auto_release_team/auto_release_team.py | 4 ++-- .../developer_review_reply.py | 4 ++-- .../pagetype/featured_app/featured_app.py | 4 ++-- .../marketplace_add_on/marketplace_add_on.py | 4 ++-- .../marketplace_app_payment.py | 4 ++-- .../marketplace_app_plans.py | 4 ++-- .../marketplace_app_subscription.py | 4 ++-- .../marketplace_promotional_banner.py | 4 ++-- .../marketplace_publisher_profile.py | 4 ++-- .../marketplace_settings/marketplace_settings.py | 4 ++-- .../partner_approval_request.py | 4 ++-- .../partner/pagetype/partner_tier/partner_tier.py | 4 ++-- .../account_request_rules.py | 4 ++-- .../pagetype/hybrid_saas_pool/hybrid_saas_pool.py | 4 ++-- .../saas/pagetype/product_trial/product_trial.py | 4 ++-- .../product_trial_app/product_trial_app.py | 4 ++-- .../product_trial_request.py | 4 ++-- .../product_trial_signup_field.py | 4 ++-- jcloud/saas/pagetype/saas_app/saas_app.py | 4 ++-- .../saas/pagetype/saas_app_plan/saas_app_plan.py | 4 ++-- .../saas_app_subscription.py | 4 ++-- .../pagetype/saas_app_version/saas_app_version.py | 4 ++-- .../saas/pagetype/saas_feedback/saas_feedback.py | 4 ++-- .../pagetype/saas_pool_rules/saas_pool_rules.py | 4 ++-- .../saas_remote_login/saas_remote_login.py | 4 ++-- .../saas/pagetype/saas_settings/saas_settings.py | 4 ++-- .../site_access_token/site_access_token.py | 4 ++-- jcloud/tests/before_test.py | 10 +++++----- jcloud/utils/dns.py | 4 ++-- jcloud/utils/webhook.py | 8 ++++---- 280 files changed, 577 insertions(+), 576 deletions(-) diff --git a/jcloud/api/client.py b/jcloud/api/client.py index 80f6310..ac14ea8 100644 --- a/jcloud/api/client.py +++ b/jcloud/api/client.py @@ -10,7 +10,7 @@ import jingrow from jingrow.client import set_value as _set_value from jingrow.handler import run_pg_method as _run_pg_method from jingrow.model import child_table_fields, default_fields -from jingrow.model.base_document import get_controller +from jingrow.model.base_page import get_controller from jingrow.utils import cstr from pypika.queries import QueryBuilder diff --git a/jcloud/experimental/pagetype/referral_bonus/referral_bonus.py b/jcloud/experimental/pagetype/referral_bonus/referral_bonus.py index 984844f..f587cf4 100644 --- a/jcloud/experimental/pagetype/referral_bonus/referral_bonus.py +++ b/jcloud/experimental/pagetype/referral_bonus/referral_bonus.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ReferralBonus(Document): +class ReferralBonus(Page): @jingrow.whitelist() def allocate_credits(self): # Credits have already been allocated diff --git a/jcloud/infrastructure/pagetype/ssh_access_audit/ssh_access_audit.py b/jcloud/infrastructure/pagetype/ssh_access_audit/ssh_access_audit.py index 2d16e00..9c9dcc6 100644 --- a/jcloud/infrastructure/pagetype/ssh_access_audit/ssh_access_audit.py +++ b/jcloud/infrastructure/pagetype/ssh_access_audit/ssh_access_audit.py @@ -16,7 +16,7 @@ from ansible.parsing.dataloader import DataLoader from ansible.playbook.play import Play from ansible.plugins.callback import CallbackBase from ansible.vars.manager import VariableManager -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import reconnect_on_failure @@ -32,7 +32,7 @@ SERVER_TYPES = [ ] -class SSHAccessAudit(Document): +class SSHAccessAudit(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/ssh_access_audit_host/ssh_access_audit_host.py b/jcloud/infrastructure/pagetype/ssh_access_audit_host/ssh_access_audit_host.py index a55cfdd..590a12b 100644 --- a/jcloud/infrastructure/pagetype/ssh_access_audit_host/ssh_access_audit_host.py +++ b/jcloud/infrastructure/pagetype/ssh_access_audit_host/ssh_access_audit_host.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class SSHAccessAuditHost(Document): +class SSHAccessAuditHost(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/ssh_access_audit_violation/ssh_access_audit_violation.py b/jcloud/infrastructure/pagetype/ssh_access_audit_violation/ssh_access_audit_violation.py index 9aba5d2..6458da3 100644 --- a/jcloud/infrastructure/pagetype/ssh_access_audit_violation/ssh_access_audit_violation.py +++ b/jcloud/infrastructure/pagetype/ssh_access_audit_violation/ssh_access_audit_violation.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class SSHAccessAuditViolation(Document): +class SSHAccessAuditViolation(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py b/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py index 50432cf..28471e6 100644 --- a/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py +++ b/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py @@ -10,14 +10,14 @@ from enum import Enum import botocore import jingrow from jingrow.core.utils import find, find_all -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.ansible_console.ansible_console import AnsibleAdHoc SUPPORTED_FILESYSTEMS = ["ext4"] -class VirtualDiskResize(Document): +class VirtualDiskResize(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py b/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py index a691b43..27c362e 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.ansible_console.ansible_console import AnsibleAdHoc @@ -24,7 +24,7 @@ if TYPE_CHECKING: StepStatus = Enum("StepStatus", ["Pending", "Running", "Success", "Failure"]) -class VirtualMachineMigration(Document): +class VirtualMachineMigration(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.py b/jcloud/infrastructure/pagetype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.py index bb70f58..795481a 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineMigrationBindMount(Document): +class VirtualMachineMigrationBindMount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration_mount/virtual_machine_migration_mount.py b/jcloud/infrastructure/pagetype/virtual_machine_migration_mount/virtual_machine_migration_mount.py index 916016c..29a804f 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_migration_mount/virtual_machine_migration_mount.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_migration_mount/virtual_machine_migration_mount.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineMigrationMount(Document): +class VirtualMachineMigrationMount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration_step/virtual_machine_migration_step.py b/jcloud/infrastructure/pagetype/virtual_machine_migration_step/virtual_machine_migration_step.py index 8965faa..44df041 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_migration_step/virtual_machine_migration_step.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_migration_step/virtual_machine_migration_step.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineMigrationStep(Document): +class VirtualMachineMigrationStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration_volume/virtual_machine_migration_volume.py b/jcloud/infrastructure/pagetype/virtual_machine_migration_volume/virtual_machine_migration_volume.py index f8e6128..61cdafa 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_migration_volume/virtual_machine_migration_volume.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_migration_volume/virtual_machine_migration_volume.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineMigrationVolume(Document): +class VirtualMachineMigrationVolume(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py b/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py index 3d31230..a8954ef 100644 --- a/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py +++ b/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py @@ -9,7 +9,7 @@ from enum import Enum from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page if TYPE_CHECKING: from jcloud.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import ( @@ -19,7 +19,7 @@ if TYPE_CHECKING: StepStatus = Enum("StepStatus", ["Pending", "Running", "Success", "Failure"]) -class VirtualMachineReplacement(Document): +class VirtualMachineReplacement(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/account_request/account_request.py b/jcloud/jcloud/pagetype/account_request/account_request.py index f9497b6..cff9e56 100644 --- a/jcloud/jcloud/pagetype/account_request/account_request.py +++ b/jcloud/jcloud/pagetype/account_request/account_request.py @@ -6,7 +6,7 @@ from __future__ import annotations import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_url, random_string from jcloud.utils import get_country_info, is_valid_email_address @@ -14,7 +14,7 @@ from jcloud.utils.otp import generate_otp from jcloud.utils.telemetry import capture -class AccountRequest(Document): +class AccountRequest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/account_request_jcloud_role/account_request_jcloud_role.py b/jcloud/jcloud/pagetype/account_request_jcloud_role/account_request_jcloud_role.py index ff4397a..1c48466 100644 --- a/jcloud/jcloud/pagetype/account_request_jcloud_role/account_request_jcloud_role.py +++ b/jcloud/jcloud/pagetype/account_request_jcloud_role/account_request_jcloud_role.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AccountRequestJcloudRole(Document): +class AccountRequestJcloudRole(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/add_on_settings/add_on_settings.py b/jcloud/jcloud/pagetype/add_on_settings/add_on_settings.py index 5000b16..0abc579 100644 --- a/jcloud/jcloud/pagetype/add_on_settings/add_on_settings.py +++ b/jcloud/jcloud/pagetype/add_on_settings/add_on_settings.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AddOnSettings(Document): +class AddOnSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/agent_job/agent_job.py b/jcloud/jcloud/pagetype/agent_job/agent_job.py index c40b2b0..6bea6dc 100644 --- a/jcloud/jcloud/pagetype/agent_job/agent_job.py +++ b/jcloud/jcloud/pagetype/agent_job/agent_job.py @@ -9,7 +9,7 @@ import traceback import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.monitor import add_data_to_monitor from jingrow.utils import ( add_days, @@ -36,7 +36,7 @@ from jcloud.utils import has_role, log_error, timer AGENT_LOG_KEY = "agent-jobs" -class AgentJob(Document): +class AgentJob(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/agent_job_step/agent_job_step.py b/jcloud/jcloud/pagetype/agent_job_step/agent_job_step.py index 3033d9c..635622f 100644 --- a/jcloud/jcloud/pagetype/agent_job_step/agent_job_step.py +++ b/jcloud/jcloud/pagetype/agent_job_step/agent_job_step.py @@ -3,10 +3,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AgentJobStep(Document): +class AgentJobStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/agent_job_type/agent_job_type.py b/jcloud/jcloud/pagetype/agent_job_type/agent_job_type.py index 088647f..0ac2c04 100644 --- a/jcloud/jcloud/pagetype/agent_job_type/agent_job_type.py +++ b/jcloud/jcloud/pagetype/agent_job_type/agent_job_type.py @@ -3,12 +3,12 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import ttl_cache -class AgentJobType(Document): +class AgentJobType(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/agent_job_type_step/agent_job_type_step.py b/jcloud/jcloud/pagetype/agent_job_type_step/agent_job_type_step.py index b41146b..a489d44 100644 --- a/jcloud/jcloud/pagetype/agent_job_type_step/agent_job_type_step.py +++ b/jcloud/jcloud/pagetype/agent_job_type_step/agent_job_type_step.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AgentJobTypeStep(Document): +class AgentJobTypeStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/agent_request_failure/agent_request_failure.py b/jcloud/jcloud/pagetype/agent_request_failure/agent_request_failure.py index 4dfb3b6..decd245 100644 --- a/jcloud/jcloud/pagetype/agent_request_failure/agent_request_failure.py +++ b/jcloud/jcloud/pagetype/agent_request_failure/agent_request_failure.py @@ -3,13 +3,13 @@ import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.utils import log_error -class AgentRequestFailure(Document): +class AgentRequestFailure(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/alertmanager_webhook_log/alertmanager_webhook_log.py b/jcloud/jcloud/pagetype/alertmanager_webhook_log/alertmanager_webhook_log.py index afbfb04..4f81324 100644 --- a/jcloud/jcloud/pagetype/alertmanager_webhook_log/alertmanager_webhook_log.py +++ b/jcloud/jcloud/pagetype/alertmanager_webhook_log/alertmanager_webhook_log.py @@ -8,7 +8,7 @@ from typing import TYPE_CHECKING import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_url_to_form from jingrow.utils.background_jobs import enqueue_pg from jingrow.utils.data import add_to_date @@ -43,7 +43,7 @@ Labels: """ -class AlertmanagerWebhookLog(Document): +class AlertmanagerWebhookLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.py b/jcloud/jcloud/pagetype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.py index 15fac4b..36594b1 100644 --- a/jcloud/jcloud/pagetype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.py +++ b/jcloud/jcloud/pagetype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AlertmanagerWebhookLogReactionJob(Document): +class AlertmanagerWebhookLogReactionJob(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/alipay_payment_record/alipay_payment_record.py b/jcloud/jcloud/pagetype/alipay_payment_record/alipay_payment_record.py index 0194b1d..aa5c723 100644 --- a/jcloud/jcloud/pagetype/alipay_payment_record/alipay_payment_record.py +++ b/jcloud/jcloud/pagetype/alipay_payment_record/alipay_payment_record.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AlipayPaymentRecord(Document): +class AlipayPaymentRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ansible_console/ansible_console.py b/jcloud/jcloud/pagetype/ansible_console/ansible_console.py index 3d250d2..090f93f 100644 --- a/jcloud/jcloud/pagetype/ansible_console/ansible_console.py +++ b/jcloud/jcloud/pagetype/ansible_console/ansible_console.py @@ -13,13 +13,13 @@ from ansible.parsing.dataloader import DataLoader from ansible.playbook.play import Play from ansible.plugins.callback import CallbackBase from ansible.vars.manager import VariableManager -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_timedelta from jcloud.utils import reconnect_on_failure -class AnsibleConsole(Document): +class AnsibleConsole(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ansible_console_log/ansible_console_log.py b/jcloud/jcloud/pagetype/ansible_console_log/ansible_console_log.py index 1f0746d..41a120b 100644 --- a/jcloud/jcloud/pagetype/ansible_console_log/ansible_console_log.py +++ b/jcloud/jcloud/pagetype/ansible_console_log/ansible_console_log.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AnsibleConsoleLog(Document): +class AnsibleConsoleLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ansible_console_output/ansible_console_output.py b/jcloud/jcloud/pagetype/ansible_console_output/ansible_console_output.py index 5f8feba..c33c9a0 100644 --- a/jcloud/jcloud/pagetype/ansible_console_output/ansible_console_output.py +++ b/jcloud/jcloud/pagetype/ansible_console_output/ansible_console_output.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AnsibleConsoleOutput(Document): +class AnsibleConsoleOutput(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ansible_play/ansible_play.py b/jcloud/jcloud/pagetype/ansible_play/ansible_play.py index 0373d79..f1de2de 100644 --- a/jcloud/jcloud/pagetype/ansible_play/ansible_play.py +++ b/jcloud/jcloud/pagetype/ansible_play/ansible_play.py @@ -4,14 +4,14 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cstr from jcloud.api.client import is_owned_by_team from jcloud.utils import poly_get_pagetype -class AnsiblePlay(Document): +class AnsiblePlay(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ansible_task/ansible_task.py b/jcloud/jcloud/pagetype/ansible_task/ansible_task.py index 293b9db..fe10b67 100644 --- a/jcloud/jcloud/pagetype/ansible_task/ansible_task.py +++ b/jcloud/jcloud/pagetype/ansible_task/ansible_task.py @@ -4,10 +4,10 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AnsibleTask(Document): +class AnsibleTask(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app/app.py b/jcloud/jcloud/pagetype/app/app.py index 4a6526c..a2eedeb 100644 --- a/jcloud/jcloud/pagetype/app/app.py +++ b/jcloud/jcloud/pagetype/app/app.py @@ -7,14 +7,14 @@ import typing import rq import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils.jobs import has_job_timeout_exceeded if typing.TYPE_CHECKING: from jcloud.jcloud.pagetype.app_source.app_source import AppSource -class App(Document): +class App(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_group/app_group.py b/jcloud/jcloud/pagetype/app_group/app_group.py index d22238b..b22d77a 100644 --- a/jcloud/jcloud/pagetype/app_group/app_group.py +++ b/jcloud/jcloud/pagetype/app_group/app_group.py @@ -4,10 +4,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppGroup(Document): +class AppGroup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_patch/app_patch.py b/jcloud/jcloud/pagetype/app_patch/app_patch.py index 74bedb5..1e8329c 100644 --- a/jcloud/jcloud/pagetype/app_patch/app_patch.py +++ b/jcloud/jcloud/pagetype/app_patch/app_patch.py @@ -7,7 +7,7 @@ from typing import Optional, TypedDict import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.api.client import dashboard_whitelist @@ -38,7 +38,7 @@ if typing.TYPE_CHECKING: from jcloud.jcloud.pagetype.agent_job.agent_job import AgentJob -class AppPatch(Document): +class AppPatch(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_release/app_release.py b/jcloud/jcloud/pagetype/app_release/app_release.py index e9fc743..b66f8d2 100644 --- a/jcloud/jcloud/pagetype/app_release/app_release.py +++ b/jcloud/jcloud/pagetype/app_release/app_release.py @@ -9,7 +9,7 @@ from datetime import datetime from typing import Optional, TypedDict import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.github import get_access_token from jcloud.jcloud.pagetype.app_source.app_source import AppSource @@ -31,7 +31,7 @@ class AppReleasePair(TypedDict): new: AppReleaseDict -class AppRelease(Document): +class AppRelease(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_release_approval_request/app_release_approval_request.py b/jcloud/jcloud/pagetype/app_release_approval_request/app_release_approval_request.py index 3a3047e..efe2fe2 100644 --- a/jcloud/jcloud/pagetype/app_release_approval_request/app_release_approval_request.py +++ b/jcloud/jcloud/pagetype/app_release_approval_request/app_release_approval_request.py @@ -6,7 +6,7 @@ import json import re import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import make_autoname from pygments import highlight from pygments.formatters import HtmlFormatter as HF @@ -15,7 +15,7 @@ from pygments.lexers import PythonLexer as PL from jcloud.jcloud.pagetype.app_release.app_release import AppRelease -class AppReleaseApprovalRequest(Document): +class AppReleaseApprovalRequest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_release_difference/app_release_difference.py b/jcloud/jcloud/pagetype/app_release_difference/app_release_difference.py index 3f7fab2..7909433 100644 --- a/jcloud/jcloud/pagetype/app_release_difference/app_release_difference.py +++ b/jcloud/jcloud/pagetype/app_release_difference/app_release_difference.py @@ -7,13 +7,13 @@ import json import re import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from github import Github from jcloud.api.github import get_access_token -class AppReleaseDifference(Document): +class AppReleaseDifference(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_rename/app_rename.py b/jcloud/jcloud/pagetype/app_rename/app_rename.py index 9eb478e..05487f8 100644 --- a/jcloud/jcloud/pagetype/app_rename/app_rename.py +++ b/jcloud/jcloud/pagetype/app_rename/app_rename.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppRename(Document): +class AppRename(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_source/app_source.py b/jcloud/jcloud/pagetype/app_source/app_source.py index 8fa3b56..476ab65 100644 --- a/jcloud/jcloud/pagetype/app_source/app_source.py +++ b/jcloud/jcloud/pagetype/app_source/app_source.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, List, Optional import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import make_autoname from jcloud.api.github import get_access_token, get_auth_headers from jcloud.overrides import get_permission_query_conditions_for_pagetype @@ -17,7 +17,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.app_release.app_release import AppRelease -class AppSource(Document): +class AppSource(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_source_version/app_source_version.py b/jcloud/jcloud/pagetype/app_source_version/app_source_version.py index f9f5b0a..e3d00ac 100644 --- a/jcloud/jcloud/pagetype/app_source_version/app_source_version.py +++ b/jcloud/jcloud/pagetype/app_source_version/app_source_version.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppSourceVersion(Document): +class AppSourceVersion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/app_tag/app_tag.py b/jcloud/jcloud/pagetype/app_tag/app_tag.py index 7b823dd..d8814e8 100644 --- a/jcloud/jcloud/pagetype/app_tag/app_tag.py +++ b/jcloud/jcloud/pagetype/app_tag/app_tag.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppTag(Document): +class AppTag(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/audit_log/audit_log.py b/jcloud/jcloud/pagetype/audit_log/audit_log.py index 04f9f3d..509d0dc 100644 --- a/jcloud/jcloud/pagetype/audit_log/audit_log.py +++ b/jcloud/jcloud/pagetype/audit_log/audit_log.py @@ -3,12 +3,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.telegram_message.telegram_message import TelegramMessage -class AuditLog(Document): +class AuditLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py b/jcloud/jcloud/pagetype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py index fa76d3f..5f2f3b4 100644 --- a/jcloud/jcloud/pagetype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py +++ b/jcloud/jcloud/pagetype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py @@ -5,7 +5,7 @@ from __future__ import annotations import boto3 import jingrow import jingrow.utils -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cint, flt from jcloud.jcloud.pagetype.telegram_message.telegram_message import TelegramMessage @@ -14,7 +14,7 @@ from jcloud.utils import log_error AWS_HOURS_IN_A_MONTH = 730 -class AWSSavingsPlanRecommendation(Document): +class AWSSavingsPlanRecommendation(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/backup_bucket/backup_bucket.py b/jcloud/jcloud/pagetype/backup_bucket/backup_bucket.py index 4d8fe50..20d5293 100644 --- a/jcloud/jcloud/pagetype/backup_bucket/backup_bucket.py +++ b/jcloud/jcloud/pagetype/backup_bucket/backup_bucket.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BackupBucket(Document): +class BackupBucket(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/backup_restoration_test/backup_restoration_test.py b/jcloud/jcloud/pagetype/backup_restoration_test/backup_restoration_test.py index 7c1d27f..e8d8919 100644 --- a/jcloud/jcloud/pagetype/backup_restoration_test/backup_restoration_test.py +++ b/jcloud/jcloud/pagetype/backup_restoration_test/backup_restoration_test.py @@ -2,13 +2,13 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.site import _new from jcloud.jcloud.pagetype.site.site import prepare_site -class BackupRestorationTest(Document): +class BackupRestorationTest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py b/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py index 86e3aca..53131b4 100644 --- a/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py +++ b/jcloud/jcloud/pagetype/balance_transaction/balance_transaction.py @@ -3,12 +3,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.overrides import get_permission_query_conditions_for_pagetype -class BalanceTransaction(Document): +class BalanceTransaction(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/balance_transaction_allocation/balance_transaction_allocation.py b/jcloud/jcloud/pagetype/balance_transaction_allocation/balance_transaction_allocation.py index d3f0969..7a00b60 100644 --- a/jcloud/jcloud/pagetype/balance_transaction_allocation/balance_transaction_allocation.py +++ b/jcloud/jcloud/pagetype/balance_transaction_allocation/balance_transaction_allocation.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BalanceTransactionAllocation(Document): +class BalanceTransactionAllocation(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench/bench.py b/jcloud/jcloud/pagetype/bench/bench.py index 9522c39..e6d3c3f 100644 --- a/jcloud/jcloud/pagetype/bench/bench.py +++ b/jcloud/jcloud/pagetype/bench/bench.py @@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, Generator, Iterable, Literal import jingrow import pytz from jingrow.exceptions import DoesNotExistError -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import append_number_if_name_exists, make_autoname from jingrow.utils import get_system_timezone @@ -51,7 +51,7 @@ if TYPE_CHECKING: ] -class Bench(Document): +class Bench(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_app/bench_app.py b/jcloud/jcloud/pagetype/bench_app/bench_app.py index 2326fb1..df53fd0 100644 --- a/jcloud/jcloud/pagetype/bench_app/bench_app.py +++ b/jcloud/jcloud/pagetype/bench_app/bench_app.py @@ -3,10 +3,10 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchApp(Document): +class BenchApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_dependency/bench_dependency.py b/jcloud/jcloud/pagetype/bench_dependency/bench_dependency.py index 9bafa4a..0b67a04 100644 --- a/jcloud/jcloud/pagetype/bench_dependency/bench_dependency.py +++ b/jcloud/jcloud/pagetype/bench_dependency/bench_dependency.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchDependency(Document): +class BenchDependency(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_dependency_version/bench_dependency_version.py b/jcloud/jcloud/pagetype/bench_dependency_version/bench_dependency_version.py index 60116ac..ecce80a 100644 --- a/jcloud/jcloud/pagetype/bench_dependency_version/bench_dependency_version.py +++ b/jcloud/jcloud/pagetype/bench_dependency_version/bench_dependency_version.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchDependencyVersion(Document): +class BenchDependencyVersion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_get_app_cache/bench_get_app_cache.py b/jcloud/jcloud/pagetype/bench_get_app_cache/bench_get_app_cache.py index f28c40f..26794ac 100644 --- a/jcloud/jcloud/pagetype/bench_get_app_cache/bench_get_app_cache.py +++ b/jcloud/jcloud/pagetype/bench_get_app_cache/bench_get_app_cache.py @@ -4,13 +4,13 @@ from datetime import datetime import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.deploy_candidate.cache_utils import run_command_in_docker_cache from jcloud.utils import ttl_cache -class BenchGetAppCache(Document): +class BenchGetAppCache(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -34,7 +34,7 @@ class BenchGetAppCache(Document): def load_from_db(self): db = {v.name: v for v in BenchGetAppCache.get_data()} - return super(Document, self).__init__(db[self.name]) + return super(Page, self).__init__(db[self.name]) def delete(self): run_command_in_docker_cache(f"rm bench/apps/{self.file_name}") diff --git a/jcloud/jcloud/pagetype/bench_mount/bench_mount.py b/jcloud/jcloud/pagetype/bench_mount/bench_mount.py index 5c93220..d46c761 100644 --- a/jcloud/jcloud/pagetype/bench_mount/bench_mount.py +++ b/jcloud/jcloud/pagetype/bench_mount/bench_mount.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchMount(Document): +class BenchMount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_shell/bench_shell.py b/jcloud/jcloud/pagetype/bench_shell/bench_shell.py index 2ab6a37..3321538 100644 --- a/jcloud/jcloud/pagetype/bench_shell/bench_shell.py +++ b/jcloud/jcloud/pagetype/bench_shell/bench_shell.py @@ -5,13 +5,13 @@ import json from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page if TYPE_CHECKING: from jcloud.jcloud.pagetype.bench.bench import Bench -class BenchShell(Document): +class BenchShell(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_shell_log/bench_shell_log.py b/jcloud/jcloud/pagetype/bench_shell_log/bench_shell_log.py index 077aa7e..d7e526e 100644 --- a/jcloud/jcloud/pagetype/bench_shell_log/bench_shell_log.py +++ b/jcloud/jcloud/pagetype/bench_shell_log/bench_shell_log.py @@ -5,7 +5,7 @@ from datetime import datetime from typing import Optional, TypedDict import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page ExecuteResult = TypedDict( "ExecuteResult", @@ -23,7 +23,7 @@ ExecuteResult = TypedDict( ) -class BenchShellLog(Document): +class BenchShellLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_site_update/bench_site_update.py b/jcloud/jcloud/pagetype/bench_site_update/bench_site_update.py index e842c42..2f73a43 100644 --- a/jcloud/jcloud/pagetype/bench_site_update/bench_site_update.py +++ b/jcloud/jcloud/pagetype/bench_site_update/bench_site_update.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchSiteUpdate(Document): +class BenchSiteUpdate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_update/bench_update.py b/jcloud/jcloud/pagetype/bench_update/bench_update.py index 9c27fa5..b185426 100644 --- a/jcloud/jcloud/pagetype/bench_update/bench_update.py +++ b/jcloud/jcloud/pagetype/bench_update/bench_update.py @@ -6,7 +6,7 @@ from __future__ import annotations from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import get_current_team @@ -14,7 +14,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.bench.bench import Bench -class BenchUpdate(Document): +class BenchUpdate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_update_app/bench_update_app.py b/jcloud/jcloud/pagetype/bench_update_app/bench_update_app.py index 0c47c59..e88b42c 100644 --- a/jcloud/jcloud/pagetype/bench_update_app/bench_update_app.py +++ b/jcloud/jcloud/pagetype/bench_update_app/bench_update_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchUpdateApp(Document): +class BenchUpdateApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/bench_variable/bench_variable.py b/jcloud/jcloud/pagetype/bench_variable/bench_variable.py index b882a1d..4e03255 100644 --- a/jcloud/jcloud/pagetype/bench_variable/bench_variable.py +++ b/jcloud/jcloud/pagetype/bench_variable/bench_variable.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BenchVariable(Document): +class BenchVariable(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/blocked_domain/blocked_domain.py b/jcloud/jcloud/pagetype/blocked_domain/blocked_domain.py index b1ff06f..c95419c 100644 --- a/jcloud/jcloud/pagetype/blocked_domain/blocked_domain.py +++ b/jcloud/jcloud/pagetype/blocked_domain/blocked_domain.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class BlockedDomain(Document): +class BlockedDomain(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/build_cache_shell/build_cache_shell.py b/jcloud/jcloud/pagetype/build_cache_shell/build_cache_shell.py index b03ddfb..d0b4226 100644 --- a/jcloud/jcloud/pagetype/build_cache_shell/build_cache_shell.py +++ b/jcloud/jcloud/pagetype/build_cache_shell/build_cache_shell.py @@ -4,12 +4,12 @@ import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent -class BuildCacheShell(Document): +class BuildCacheShell(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/certificate_authority/certificate_authority.py b/jcloud/jcloud/pagetype/certificate_authority/certificate_authority.py index 499dfb3..f1cc3a7 100644 --- a/jcloud/jcloud/pagetype/certificate_authority/certificate_authority.py +++ b/jcloud/jcloud/pagetype/certificate_authority/certificate_authority.py @@ -13,12 +13,12 @@ from pathlib import Path import jingrow import OpenSSL -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import developer_mode_only -class CertificateAuthority(Document): +class CertificateAuthority(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/child_team_member/child_team_member.py b/jcloud/jcloud/pagetype/child_team_member/child_team_member.py index b21dc49..ed5e86c 100644 --- a/jcloud/jcloud/pagetype/child_team_member/child_team_member.py +++ b/jcloud/jcloud/pagetype/child_team_member/child_team_member.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ChildTeamMember(Document): +class ChildTeamMember(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/cloud_region/cloud_region.py b/jcloud/jcloud/pagetype/cloud_region/cloud_region.py index 47b4c9f..7e8ea48 100644 --- a/jcloud/jcloud/pagetype/cloud_region/cloud_region.py +++ b/jcloud/jcloud/pagetype/cloud_region/cloud_region.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class CloudRegion(Document): +class CloudRegion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/cluster/cluster.py b/jcloud/jcloud/pagetype/cluster/cluster.py index a945476..985311e 100644 --- a/jcloud/jcloud/pagetype/cluster/cluster.py +++ b/jcloud/jcloud/pagetype/cluster/cluster.py @@ -13,7 +13,7 @@ from typing import ClassVar, Generator import boto3 import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from hcloud import APIException, Client from hcloud.networks.domain import NetworkSubnet from oci.config import validate_config @@ -43,7 +43,7 @@ if typing.TYPE_CHECKING: from jcloud.jcloud.pagetype.virtual_machine.virtual_machine import VirtualMachine -class Cluster(Document): +class Cluster(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/code_server/code_server.py b/jcloud/jcloud/pagetype/code_server/code_server.py index 560e55a..2b6dc0c 100644 --- a/jcloud/jcloud/pagetype/code_server/code_server.py +++ b/jcloud/jcloud/pagetype/code_server/code_server.py @@ -2,7 +2,7 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import append_number_if_name_exists from jcloud.agent import Agent @@ -10,7 +10,7 @@ from jcloud.utils import log_error from jcloud.utils.dns import _change_dns_record, create_dns_record -class CodeServer(Document): +class CodeServer(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/communication_email/communication_email.py b/jcloud/jcloud/pagetype/communication_email/communication_email.py index 50bd7f4..4b3d4f1 100644 --- a/jcloud/jcloud/pagetype/communication_email/communication_email.py +++ b/jcloud/jcloud/pagetype/communication_email/communication_email.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class CommunicationEmail(Document): +class CommunicationEmail(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/cookie_preference_log/cookie_preference_log.py b/jcloud/jcloud/pagetype/cookie_preference_log/cookie_preference_log.py index bafd80e..b86f1a8 100644 --- a/jcloud/jcloud/pagetype/cookie_preference_log/cookie_preference_log.py +++ b/jcloud/jcloud/pagetype/cookie_preference_log/cookie_preference_log.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class CookiePreferenceLog(Document): +class CookiePreferenceLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/currency_exchange/currency_exchange.py b/jcloud/jcloud/pagetype/currency_exchange/currency_exchange.py index 47777c8..329034c 100644 --- a/jcloud/jcloud/pagetype/currency_exchange/currency_exchange.py +++ b/jcloud/jcloud/pagetype/currency_exchange/currency_exchange.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class CurrencyExchange(Document): +class CurrencyExchange(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/dashboard_banner/dashboard_banner.py b/jcloud/jcloud/pagetype/dashboard_banner/dashboard_banner.py index d98d1ee..5f34dc8 100644 --- a/jcloud/jcloud/pagetype/dashboard_banner/dashboard_banner.py +++ b/jcloud/jcloud/pagetype/dashboard_banner/dashboard_banner.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DashboardBanner(Document): +class DashboardBanner(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/database_server_mariadb_variable/database_server_mariadb_variable.py b/jcloud/jcloud/pagetype/database_server_mariadb_variable/database_server_mariadb_variable.py index 20d489c..da81978 100644 --- a/jcloud/jcloud/pagetype/database_server_mariadb_variable/database_server_mariadb_variable.py +++ b/jcloud/jcloud/pagetype/database_server_mariadb_variable/database_server_mariadb_variable.py @@ -4,13 +4,13 @@ from typing import Any import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.runner import Ansible from jcloud.utils import log_error -class DatabaseServerMariaDBVariable(Document): +class DatabaseServerMariaDBVariable(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy/deploy.py b/jcloud/jcloud/pagetype/deploy/deploy.py index acdec32..0eb30b9 100644 --- a/jcloud/jcloud/pagetype/deploy/deploy.py +++ b/jcloud/jcloud/pagetype/deploy/deploy.py @@ -4,14 +4,14 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import append_number_if_name_exists from jcloud.overrides import get_permission_query_conditions_for_pagetype from jcloud.utils import log_error -class Deploy(Document): +class Deploy(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_bench/deploy_bench.py b/jcloud/jcloud/pagetype/deploy_bench/deploy_bench.py index eb47788..1c67eff 100644 --- a/jcloud/jcloud/pagetype/deploy_bench/deploy_bench.py +++ b/jcloud/jcloud/pagetype/deploy_bench/deploy_bench.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployBench(Document): +class DeployBench(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate/deploy_candidate.py b/jcloud/jcloud/pagetype/deploy_candidate/deploy_candidate.py index 111977a..cb0802d 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate/deploy_candidate.py +++ b/jcloud/jcloud/pagetype/deploy_candidate/deploy_candidate.py @@ -21,7 +21,7 @@ from typing import Any, Literal import jingrow import jingrow.utils from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import make_autoname from jingrow.utils import now_datetime as now from jingrow.utils import rounded @@ -64,7 +64,7 @@ if typing.TYPE_CHECKING: from jcloud.jcloud.pagetype.release_group.release_group import ReleaseGroup -class DeployCandidate(Document): +class DeployCandidate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate/deploy_notifications.py b/jcloud/jcloud/pagetype/deploy_candidate/deploy_notifications.py index d871c24..7cde2aa 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate/deploy_notifications.py +++ b/jcloud/jcloud/pagetype/deploy_candidate/deploy_notifications.py @@ -41,7 +41,7 @@ Details = TypedDict( MatchStrings = str | list[str] if typing.TYPE_CHECKING: - from jingrow import Document + from jingrow import Page from jcloud.jcloud.pagetype.deploy_candidate.deploy_candidate import DeployCandidate from jcloud.jcloud.pagetype.deploy_candidate_app.deploy_candidate_app import ( @@ -1019,7 +1019,7 @@ def get_ct_row( match_value: str, field: str, ct_field: str, -) -> Optional["Document"]: +) -> Optional["Page"]: ct = dc.get(field) if not ct: return diff --git a/jcloud/jcloud/pagetype/deploy_candidate_app/deploy_candidate_app.py b/jcloud/jcloud/pagetype/deploy_candidate_app/deploy_candidate_app.py index 3577fd3..6915510 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_app/deploy_candidate_app.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_app/deploy_candidate_app.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidateApp(Document): +class DeployCandidateApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_build_step/deploy_candidate_build_step.py b/jcloud/jcloud/pagetype/deploy_candidate_build_step/deploy_candidate_build_step.py index 06c3b9c..18c769e 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_build_step/deploy_candidate_build_step.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_build_step/deploy_candidate_build_step.py @@ -4,10 +4,10 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidateBuildStep(Document): +class DeployCandidateBuildStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_dependency/deploy_candidate_dependency.py b/jcloud/jcloud/pagetype/deploy_candidate_dependency/deploy_candidate_dependency.py index 2f8a1ed..aa81e23 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_dependency/deploy_candidate_dependency.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_dependency/deploy_candidate_dependency.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidateDependency(Document): +class DeployCandidateDependency(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_difference/deploy_candidate_difference.py b/jcloud/jcloud/pagetype/deploy_candidate_difference/deploy_candidate_difference.py index 8e57c1c..cae6270 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_difference/deploy_candidate_difference.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_difference/deploy_candidate_difference.py @@ -5,12 +5,12 @@ import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.overrides import get_permission_query_conditions_for_pagetype -class DeployCandidateDifference(Document): +class DeployCandidateDifference(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_difference_app/deploy_candidate_difference_app.py b/jcloud/jcloud/pagetype/deploy_candidate_difference_app/deploy_candidate_difference_app.py index 6c0484b..95f826f 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_difference_app/deploy_candidate_difference_app.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_difference_app/deploy_candidate_difference_app.py @@ -4,10 +4,10 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidateDifferenceApp(Document): +class DeployCandidateDifferenceApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_package/deploy_candidate_package.py b/jcloud/jcloud/pagetype/deploy_candidate_package/deploy_candidate_package.py index 95a5798..c1ce888 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_package/deploy_candidate_package.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_package/deploy_candidate_package.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidatePackage(Document): +class DeployCandidatePackage(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/deploy_candidate_variable/deploy_candidate_variable.py b/jcloud/jcloud/pagetype/deploy_candidate_variable/deploy_candidate_variable.py index 95cd5c8..92f75e3 100644 --- a/jcloud/jcloud/pagetype/deploy_candidate_variable/deploy_candidate_variable.py +++ b/jcloud/jcloud/pagetype/deploy_candidate_variable/deploy_candidate_variable.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeployCandidateVariable(Document): +class DeployCandidateVariable(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/dns_resolution/dns_resolution.py b/jcloud/jcloud/pagetype/dns_resolution/dns_resolution.py index 00ba8cc..a189a4a 100644 --- a/jcloud/jcloud/pagetype/dns_resolution/dns_resolution.py +++ b/jcloud/jcloud/pagetype/dns_resolution/dns_resolution.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DnsResolution(Document): +class DnsResolution(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/domain_owner/domain_owner.py b/jcloud/jcloud/pagetype/domain_owner/domain_owner.py index 602fcd4..81f3763 100644 --- a/jcloud/jcloud/pagetype/domain_owner/domain_owner.py +++ b/jcloud/jcloud/pagetype/domain_owner/domain_owner.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DomainOwner(Document): +class DomainOwner(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/drip_email/drip_email.py b/jcloud/jcloud/pagetype/drip_email/drip_email.py index 5d7e9bc..ea2783c 100644 --- a/jcloud/jcloud/pagetype/drip_email/drip_email.py +++ b/jcloud/jcloud/pagetype/drip_email/drip_email.py @@ -9,13 +9,13 @@ import jingrow import rq import rq.exceptions import rq.timeouts -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.make_random import get_random from jcloud.utils import log_error -class DripEmail(Document): +class DripEmail(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py index 82abe48..a1da0f6 100644 --- a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py +++ b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class FirewallRules(Document): +class FirewallRules(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/github_webhook_log/github_webhook_log.py b/jcloud/jcloud/pagetype/github_webhook_log/github_webhook_log.py index 7fcecb1..35326fa 100644 --- a/jcloud/jcloud/pagetype/github_webhook_log/github_webhook_log.py +++ b/jcloud/jcloud/pagetype/github_webhook_log/github_webhook_log.py @@ -9,7 +9,7 @@ import json from typing import TYPE_CHECKING, Optional import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder import Interval from jingrow.query_builder.functions import Now @@ -19,7 +19,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.app_source.app_source import AppSource -class GitHubWebhookLog(Document): +class GitHubWebhookLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_alerts/incident_alerts.py b/jcloud/jcloud/pagetype/incident_alerts/incident_alerts.py index 4f7356a..c6237c5 100644 --- a/jcloud/jcloud/pagetype/incident_alerts/incident_alerts.py +++ b/jcloud/jcloud/pagetype/incident_alerts/incident_alerts.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentAlerts(Document): +class IncidentAlerts(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_settings/incident_settings.py b/jcloud/jcloud/pagetype/incident_settings/incident_settings.py index 8d8ee60..e79b990 100644 --- a/jcloud/jcloud/pagetype/incident_settings/incident_settings.py +++ b/jcloud/jcloud/pagetype/incident_settings/incident_settings.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentSettings(Document): +class IncidentSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.py b/jcloud/jcloud/pagetype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.py index 42bf6fd..d036395 100644 --- a/jcloud/jcloud/pagetype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.py +++ b/jcloud/jcloud/pagetype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentSettingsSelfHostedUser(Document): +class IncidentSettingsSelfHostedUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_settings_user/incident_settings_user.py b/jcloud/jcloud/pagetype/incident_settings_user/incident_settings_user.py index 9f912c7..5d0d646 100644 --- a/jcloud/jcloud/pagetype/incident_settings_user/incident_settings_user.py +++ b/jcloud/jcloud/pagetype/incident_settings_user/incident_settings_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentSettingsUser(Document): +class IncidentSettingsUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_suggestion/incident_suggestion.py b/jcloud/jcloud/pagetype/incident_suggestion/incident_suggestion.py index 99396e2..416a520 100644 --- a/jcloud/jcloud/pagetype/incident_suggestion/incident_suggestion.py +++ b/jcloud/jcloud/pagetype/incident_suggestion/incident_suggestion.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentSuggestion(Document): +class IncidentSuggestion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/incident_updates/incident_updates.py b/jcloud/jcloud/pagetype/incident_updates/incident_updates.py index 1fda771..d70d5d0 100644 --- a/jcloud/jcloud/pagetype/incident_updates/incident_updates.py +++ b/jcloud/jcloud/pagetype/incident_updates/incident_updates.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class IncidentUpdates(Document): +class IncidentUpdates(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/invoice/invoice.py b/jcloud/jcloud/pagetype/invoice/invoice.py index bebc1cf..6ed7f5b 100644 --- a/jcloud/jcloud/pagetype/invoice/invoice.py +++ b/jcloud/jcloud/pagetype/invoice/invoice.py @@ -5,7 +5,7 @@ from __future__ import annotations import jingrow from jingrow import _ -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cint, flt, getdate from jingrow.utils.data import fmt_money @@ -20,7 +20,7 @@ from jcloud.utils.billing import ( ) -class Invoice(Document): +class Invoice(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/invoice_credit_allocation/invoice_credit_allocation.py b/jcloud/jcloud/pagetype/invoice_credit_allocation/invoice_credit_allocation.py index c4fac8e..7eb87cb 100644 --- a/jcloud/jcloud/pagetype/invoice_credit_allocation/invoice_credit_allocation.py +++ b/jcloud/jcloud/pagetype/invoice_credit_allocation/invoice_credit_allocation.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class InvoiceCreditAllocation(Document): +class InvoiceCreditAllocation(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/invoice_discount/invoice_discount.py b/jcloud/jcloud/pagetype/invoice_discount/invoice_discount.py index 3cc5d16..a684bf6 100644 --- a/jcloud/jcloud/pagetype/invoice_discount/invoice_discount.py +++ b/jcloud/jcloud/pagetype/invoice_discount/invoice_discount.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class InvoiceDiscount(Document): +class InvoiceDiscount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/invoice_item/invoice_item.py b/jcloud/jcloud/pagetype/invoice_item/invoice_item.py index a126eed..4c645eb 100644 --- a/jcloud/jcloud/pagetype/invoice_item/invoice_item.py +++ b/jcloud/jcloud/pagetype/invoice_item/invoice_item.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class InvoiceItem(Document): +class InvoiceItem(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/invoice_transaction_fee/invoice_transaction_fee.py b/jcloud/jcloud/pagetype/invoice_transaction_fee/invoice_transaction_fee.py index 7f5eb69..e560287 100644 --- a/jcloud/jcloud/pagetype/invoice_transaction_fee/invoice_transaction_fee.py +++ b/jcloud/jcloud/pagetype/invoice_transaction_fee/invoice_transaction_fee.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class InvoiceTransactionFee(Document): +class InvoiceTransactionFee(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_feedback/jcloud_feedback.py b/jcloud/jcloud/pagetype/jcloud_feedback/jcloud_feedback.py index dfe3030..534e8eb 100644 --- a/jcloud/jcloud/pagetype/jcloud_feedback/jcloud_feedback.py +++ b/jcloud/jcloud/pagetype/jcloud_feedback/jcloud_feedback.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudFeedback(Document): +class JcloudFeedback(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_job/jcloud_job.py b/jcloud/jcloud/pagetype/jcloud_job/jcloud_job.py index dcac2e3..75ee74f 100644 --- a/jcloud/jcloud/pagetype/jcloud_job/jcloud_job.py +++ b/jcloud/jcloud/pagetype/jcloud_job/jcloud_job.py @@ -4,10 +4,10 @@ import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudJob(Document): +class JcloudJob(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_job_step/jcloud_job_step.py b/jcloud/jcloud/pagetype/jcloud_job_step/jcloud_job_step.py index 8838799..0d7e38e 100644 --- a/jcloud/jcloud/pagetype/jcloud_job_step/jcloud_job_step.py +++ b/jcloud/jcloud/pagetype/jcloud_job_step/jcloud_job_step.py @@ -4,11 +4,11 @@ import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.safe_exec import safe_exec -class JcloudJobStep(Document): +class JcloudJobStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_job_type/jcloud_job_type.py b/jcloud/jcloud/pagetype/jcloud_job_type/jcloud_job_type.py index d959780..da7ae3c 100644 --- a/jcloud/jcloud/pagetype/jcloud_job_type/jcloud_job_type.py +++ b/jcloud/jcloud/pagetype/jcloud_job_type/jcloud_job_type.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudJobType(Document): +class JcloudJobType(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_job_type_step/jcloud_job_type_step.py b/jcloud/jcloud/pagetype/jcloud_job_type_step/jcloud_job_type_step.py index 6fa461f..ae8e8c3 100644 --- a/jcloud/jcloud/pagetype/jcloud_job_type_step/jcloud_job_type_step.py +++ b/jcloud/jcloud/pagetype/jcloud_job_type_step/jcloud_job_type_step.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudJobTypeStep(Document): +class JcloudJobTypeStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_method_permission/jcloud_method_permission.py b/jcloud/jcloud/pagetype/jcloud_method_permission/jcloud_method_permission.py index 1929679..92d95a3 100644 --- a/jcloud/jcloud/pagetype/jcloud_method_permission/jcloud_method_permission.py +++ b/jcloud/jcloud/pagetype/jcloud_method_permission/jcloud_method_permission.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudMethodPermission(Document): +class JcloudMethodPermission(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_notification/jcloud_notification.py b/jcloud/jcloud/pagetype/jcloud_notification/jcloud_notification.py index c3d38ae..2fa4613 100644 --- a/jcloud/jcloud/pagetype/jcloud_notification/jcloud_notification.py +++ b/jcloud/jcloud/pagetype/jcloud_notification/jcloud_notification.py @@ -3,12 +3,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist -class JcloudNotification(Document): +class JcloudNotification(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py b/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py index 5a3a4c0..bdc682e 100644 --- a/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py +++ b/jcloud/jcloud/pagetype/jcloud_permission_group/jcloud_permission_group.py @@ -2,7 +2,7 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist @@ -11,7 +11,7 @@ DEFAULT_PERMISSIONS = { } -class JcloudPermissionGroup(Document): +class JcloudPermissionGroup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_permission_group_user/jcloud_permission_group_user.py b/jcloud/jcloud/pagetype/jcloud_permission_group_user/jcloud_permission_group_user.py index 5b56ac9..1682f45 100644 --- a/jcloud/jcloud/pagetype/jcloud_permission_group_user/jcloud_permission_group_user.py +++ b/jcloud/jcloud/pagetype/jcloud_permission_group_user/jcloud_permission_group_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudPermissionGroupUser(Document): +class JcloudPermissionGroupUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_role/jcloud_role.py b/jcloud/jcloud/pagetype/jcloud_role/jcloud_role.py index 5793fb1..44da320 100644 --- a/jcloud/jcloud/pagetype/jcloud_role/jcloud_role.py +++ b/jcloud/jcloud/pagetype/jcloud_role/jcloud_role.py @@ -3,12 +3,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist -class JcloudRole(Document): +class JcloudRole(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -205,7 +205,7 @@ def check_role_permissions(pagetype: str, name: str | None = None) -> list[str] return [] -def add_permission_for_newly_created_pg(pg: Document) -> None: +def add_permission_for_newly_created_pg(pg: Page) -> None: """ Used to bulk insert permissions right after a site/release group/server is created for users with create permission for respective pagetype is enabled diff --git a/jcloud/jcloud/pagetype/jcloud_role_permission/jcloud_role_permission.py b/jcloud/jcloud/pagetype/jcloud_role_permission/jcloud_role_permission.py index ff9022c..9236a72 100644 --- a/jcloud/jcloud/pagetype/jcloud_role_permission/jcloud_role_permission.py +++ b/jcloud/jcloud/pagetype/jcloud_role_permission/jcloud_role_permission.py @@ -3,12 +3,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist -class JcloudRolePermission(Document): +class JcloudRolePermission(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_role_user/jcloud_role_user.py b/jcloud/jcloud/pagetype/jcloud_role_user/jcloud_role_user.py index db7eb4c..88a33f7 100644 --- a/jcloud/jcloud/pagetype/jcloud_role_user/jcloud_role_user.py +++ b/jcloud/jcloud/pagetype/jcloud_role_user/jcloud_role_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudRoleUser(Document): +class JcloudRoleUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py index cbae513..c4f2774 100644 --- a/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py +++ b/jcloud/jcloud/pagetype/jcloud_settings/jcloud_settings.py @@ -5,7 +5,7 @@ from __future__ import annotations import boto3 import jingrow from boto3.session import Session -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_url from twilio.rest import Client @@ -14,7 +14,7 @@ from jcloud.jcloud.pagetype.telegram_message.telegram_message import TelegramMes from jcloud.telegram_utils import Telegram -class JcloudSettings(Document): +class JcloudSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_tag/jcloud_tag.py b/jcloud/jcloud/pagetype/jcloud_tag/jcloud_tag.py index 26295ec..bc46e63 100644 --- a/jcloud/jcloud/pagetype/jcloud_tag/jcloud_tag.py +++ b/jcloud/jcloud/pagetype/jcloud_tag/jcloud_tag.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudTag(Document): +class JcloudTag(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_user_permission/jcloud_user_permission.py b/jcloud/jcloud/pagetype/jcloud_user_permission/jcloud_user_permission.py index b30063b..eac5ece 100644 --- a/jcloud/jcloud/pagetype/jcloud_user_permission/jcloud_user_permission.py +++ b/jcloud/jcloud/pagetype/jcloud_user_permission/jcloud_user_permission.py @@ -4,12 +4,12 @@ from typing import Dict import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page ALLOWED_CONFIG_PERMS = ["global", "restricted"] -class JcloudUserPermission(Document): +class JcloudUserPermission(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_webhook/jcloud_webhook.py b/jcloud/jcloud/pagetype/jcloud_webhook/jcloud_webhook.py index 3f373b3..e1a579e 100644 --- a/jcloud/jcloud/pagetype/jcloud_webhook/jcloud_webhook.py +++ b/jcloud/jcloud/pagetype/jcloud_webhook/jcloud_webhook.py @@ -12,14 +12,14 @@ import jingrow import jingrow.query_builder import jingrow.query_builder.functions import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist from jcloud.overrides import get_permission_query_conditions_for_pagetype from jcloud.utils import is_valid_hostname -class JcloudWebhook(Document): +class JcloudWebhook(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_webhook_attempt/jcloud_webhook_attempt.py b/jcloud/jcloud/pagetype/jcloud_webhook_attempt/jcloud_webhook_attempt.py index f957ca4..fe18b29 100644 --- a/jcloud/jcloud/pagetype/jcloud_webhook_attempt/jcloud_webhook_attempt.py +++ b/jcloud/jcloud/pagetype/jcloud_webhook_attempt/jcloud_webhook_attempt.py @@ -4,10 +4,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudWebhookAttempt(Document): +class JcloudWebhookAttempt(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_webhook_event/jcloud_webhook_event.py b/jcloud/jcloud/pagetype/jcloud_webhook_event/jcloud_webhook_event.py index 6a2aca8..5586622 100644 --- a/jcloud/jcloud/pagetype/jcloud_webhook_event/jcloud_webhook_event.py +++ b/jcloud/jcloud/pagetype/jcloud_webhook_event/jcloud_webhook_event.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudWebhookEvent(Document): +class JcloudWebhookEvent(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_webhook_log/jcloud_webhook_log.py b/jcloud/jcloud/pagetype/jcloud_webhook_log/jcloud_webhook_log.py index 6cc342f..81dbd23 100644 --- a/jcloud/jcloud/pagetype/jcloud_webhook_log/jcloud_webhook_log.py +++ b/jcloud/jcloud/pagetype/jcloud_webhook_log/jcloud_webhook_log.py @@ -7,13 +7,13 @@ import json import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import add_to_date, now from jcloud.overrides import get_permission_query_conditions_for_pagetype -class JcloudWebhookLog(Document): +class JcloudWebhookLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jcloud_webhook_selected_event/jcloud_webhook_selected_event.py b/jcloud/jcloud/pagetype/jcloud_webhook_selected_event/jcloud_webhook_selected_event.py index 365db1d..c62ca1a 100644 --- a/jcloud/jcloud/pagetype/jcloud_webhook_selected_event/jcloud_webhook_selected_event.py +++ b/jcloud/jcloud/pagetype/jcloud_webhook_selected_event/jcloud_webhook_selected_event.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JcloudWebhookSelectedEvent(Document): +class JcloudWebhookSelectedEvent(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jerp_app/jerp_app.py b/jcloud/jcloud/pagetype/jerp_app/jerp_app.py index 32e2adc..44b0f33 100644 --- a/jcloud/jcloud/pagetype/jerp_app/jerp_app.py +++ b/jcloud/jcloud/pagetype/jerp_app/jerp_app.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JERPApp(Document): +class JERPApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jerp_consultant/jerp_consultant.py b/jcloud/jcloud/pagetype/jerp_consultant/jerp_consultant.py index 4725177..d4bf22b 100644 --- a/jcloud/jcloud/pagetype/jerp_consultant/jerp_consultant.py +++ b/jcloud/jcloud/pagetype/jerp_consultant/jerp_consultant.py @@ -4,11 +4,11 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_fullname -class JERPConsultant(Document): +class JERPConsultant(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jerp_consultant_region/jerp_consultant_region.py b/jcloud/jcloud/pagetype/jerp_consultant_region/jerp_consultant_region.py index b9ee79d..4eeac5b 100644 --- a/jcloud/jcloud/pagetype/jerp_consultant_region/jerp_consultant_region.py +++ b/jcloud/jcloud/pagetype/jerp_consultant_region/jerp_consultant_region.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JERPConsultantRegion(Document): +class JERPConsultantRegion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jerp_site_settings/jerp_site_settings.py b/jcloud/jcloud/pagetype/jerp_site_settings/jerp_site_settings.py index fbd01fe..4f58680 100644 --- a/jcloud/jcloud/pagetype/jerp_site_settings/jerp_site_settings.py +++ b/jcloud/jcloud/pagetype/jerp_site_settings/jerp_site_settings.py @@ -4,10 +4,10 @@ import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JERPSiteSettings(Document): +class JERPSiteSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jingrow_version/jingrow_version.py b/jcloud/jcloud/pagetype/jingrow_version/jingrow_version.py index d03d109..149d6a7 100644 --- a/jcloud/jcloud/pagetype/jingrow_version/jingrow_version.py +++ b/jcloud/jcloud/pagetype/jingrow_version/jingrow_version.py @@ -6,7 +6,7 @@ # import jingrow import copy -from jingrow.model.document import Document +from jingrow.model.page import Page DEFAULT_DEPENDENCIES = [ {"dependency": "NVM_VERSION", "version": "0.36.0"}, @@ -17,7 +17,7 @@ DEFAULT_DEPENDENCIES = [ ] -class JingrowVersion(Document): +class JingrowVersion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jingrow_version_dependency/jingrow_version_dependency.py b/jcloud/jcloud/pagetype/jingrow_version_dependency/jingrow_version_dependency.py index b7d62e8..4e422e7 100644 --- a/jcloud/jcloud/pagetype/jingrow_version_dependency/jingrow_version_dependency.py +++ b/jcloud/jcloud/pagetype/jingrow_version_dependency/jingrow_version_dependency.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JingrowVersionDependency(Document): +class JingrowVersionDependency(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py b/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py index 8e82b7c..e906856 100644 --- a/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py +++ b/jcloud/jcloud/pagetype/jsite_domain/jsite_domain.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JsiteDomain(Document): +class JsiteDomain(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/jsite_server/jsite_server.py b/jcloud/jcloud/pagetype/jsite_server/jsite_server.py index 6eb2d8a..f61c316 100644 --- a/jcloud/jcloud/pagetype/jsite_server/jsite_server.py +++ b/jcloud/jcloud/pagetype/jsite_server/jsite_server.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class JsiteServer(Document): +class JsiteServer(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/log_counter/log_counter.py b/jcloud/jcloud/pagetype/log_counter/log_counter.py index 1f45ca7..fc2b83b 100644 --- a/jcloud/jcloud/pagetype/log_counter/log_counter.py +++ b/jcloud/jcloud/pagetype/log_counter/log_counter.py @@ -7,7 +7,7 @@ from typing import Optional, TypedDict import jingrow import jingrow.utils -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder import PageType from jingrow.query_builder.functions import Count from pypika import Order @@ -27,7 +27,7 @@ Counts = TypedDict( ) -class LogCounter(Document): +class LogCounter(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mail_log/mail_log.py b/jcloud/jcloud/pagetype/mail_log/mail_log.py index 7a27051..d1b72fa 100644 --- a/jcloud/jcloud/pagetype/mail_log/mail_log.py +++ b/jcloud/jcloud/pagetype/mail_log/mail_log.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MailLog(Document): +class MailLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mail_setup/mail_setup.py b/jcloud/jcloud/pagetype/mail_setup/mail_setup.py index 900df00..d9aa261 100644 --- a/jcloud/jcloud/pagetype/mail_setup/mail_setup.py +++ b/jcloud/jcloud/pagetype/mail_setup/mail_setup.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MailSetup(Document): +class MailSetup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/malware_scan/malware_scan.py b/jcloud/jcloud/pagetype/malware_scan/malware_scan.py index 4f0791d..f240c81 100644 --- a/jcloud/jcloud/pagetype/malware_scan/malware_scan.py +++ b/jcloud/jcloud/pagetype/malware_scan/malware_scan.py @@ -2,13 +2,13 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.runner import Ansible from jcloud.utils import log_error -class MalwareScan(Document): +class MalwareScan(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/managed_database_service/managed_database_service.py b/jcloud/jcloud/pagetype/managed_database_service/managed_database_service.py index 57e9905..1649efb 100644 --- a/jcloud/jcloud/pagetype/managed_database_service/managed_database_service.py +++ b/jcloud/jcloud/pagetype/managed_database_service/managed_database_service.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ManagedDatabaseService(Document): +class ManagedDatabaseService(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mariadb_stalk/mariadb_stalk.py b/jcloud/jcloud/pagetype/mariadb_stalk/mariadb_stalk.py index ad51ba3..e1701d3 100644 --- a/jcloud/jcloud/pagetype/mariadb_stalk/mariadb_stalk.py +++ b/jcloud/jcloud/pagetype/mariadb_stalk/mariadb_stalk.py @@ -5,7 +5,7 @@ import gzip from datetime import datetime import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder import Interval from jingrow.query_builder.functions import Now from jingrow.utils import add_to_date, convert_utc_to_system_timezone, now_datetime @@ -13,7 +13,7 @@ from jingrow.utils import add_to_date, convert_utc_to_system_timezone, now_datet from jcloud.utils import log_error -class MariaDBStalk(Document): +class MariaDBStalk(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.py b/jcloud/jcloud/pagetype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.py index 21d0544..133fb6a 100644 --- a/jcloud/jcloud/pagetype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.py +++ b/jcloud/jcloud/pagetype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MariaDBStalkDiagnostic(Document): +class MariaDBStalkDiagnostic(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mariadb_variable/mariadb_variable.py b/jcloud/jcloud/pagetype/mariadb_variable/mariadb_variable.py index 1255336..543d179 100644 --- a/jcloud/jcloud/pagetype/mariadb_variable/mariadb_variable.py +++ b/jcloud/jcloud/pagetype/mariadb_variable/mariadb_variable.py @@ -2,12 +2,12 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.database_server.database_server import DatabaseServer -class MariaDBVariable(Document): +class MariaDBVariable(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/marketplace_app_categories/marketplace_app_categories.py b/jcloud/jcloud/pagetype/marketplace_app_categories/marketplace_app_categories.py index c2cda9c..4cab816 100644 --- a/jcloud/jcloud/pagetype/marketplace_app_categories/marketplace_app_categories.py +++ b/jcloud/jcloud/pagetype/marketplace_app_categories/marketplace_app_categories.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAppCategories(Document): +class MarketplaceAppCategories(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/marketplace_app_category/marketplace_app_category.py b/jcloud/jcloud/pagetype/marketplace_app_category/marketplace_app_category.py index 594297c..fb1545b 100644 --- a/jcloud/jcloud/pagetype/marketplace_app_category/marketplace_app_category.py +++ b/jcloud/jcloud/pagetype/marketplace_app_category/marketplace_app_category.py @@ -3,11 +3,11 @@ # For license information, please see license.txt -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.website.utils import cleanup_page_name -class MarketplaceAppCategory(Document): +class MarketplaceAppCategory(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/marketplace_app_screenshot/marketplace_app_screenshot.py b/jcloud/jcloud/pagetype/marketplace_app_screenshot/marketplace_app_screenshot.py index fda3fcb..bda209f 100644 --- a/jcloud/jcloud/pagetype/marketplace_app_screenshot/marketplace_app_screenshot.py +++ b/jcloud/jcloud/pagetype/marketplace_app_screenshot/marketplace_app_screenshot.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAppScreenshot(Document): +class MarketplaceAppScreenshot(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/marketplace_app_version/marketplace_app_version.py b/jcloud/jcloud/pagetype/marketplace_app_version/marketplace_app_version.py index a780b96..3dacdbe 100644 --- a/jcloud/jcloud/pagetype/marketplace_app_version/marketplace_app_version.py +++ b/jcloud/jcloud/pagetype/marketplace_app_version/marketplace_app_version.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAppVersion(Document): +class MarketplaceAppVersion(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/marketplace_localisation_app/marketplace_localisation_app.py b/jcloud/jcloud/pagetype/marketplace_localisation_app/marketplace_localisation_app.py index 2e2318f..91fca44 100644 --- a/jcloud/jcloud/pagetype/marketplace_localisation_app/marketplace_localisation_app.py +++ b/jcloud/jcloud/pagetype/marketplace_localisation_app/marketplace_localisation_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceLocalisationApp(Document): +class MarketplaceLocalisationApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/module_setup_guide/module_setup_guide.py b/jcloud/jcloud/pagetype/module_setup_guide/module_setup_guide.py index dfa6a38..0c27985 100644 --- a/jcloud/jcloud/pagetype/module_setup_guide/module_setup_guide.py +++ b/jcloud/jcloud/pagetype/module_setup_guide/module_setup_guide.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ModuleSetupGuide(Document): +class ModuleSetupGuide(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py b/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py index 416eaf0..9080cd1 100644 --- a/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py +++ b/jcloud/jcloud/pagetype/mpesa_payment_record/mpesa_payment_record.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MpesaPaymentRecord(Document): +class MpesaPaymentRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mpesa_request_log/mpesa_request_log.py b/jcloud/jcloud/pagetype/mpesa_request_log/mpesa_request_log.py index 3d2ed18..96e4d02 100644 --- a/jcloud/jcloud/pagetype/mpesa_request_log/mpesa_request_log.py +++ b/jcloud/jcloud/pagetype/mpesa_request_log/mpesa_request_log.py @@ -2,10 +2,10 @@ # For license information, please see license.txt from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class MpesaRequestLog(Document): +class MpesaRequestLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/mpesa_setup/mpesa_setup.py b/jcloud/jcloud/pagetype/mpesa_setup/mpesa_setup.py index b22a22c..43fe443 100644 --- a/jcloud/jcloud/pagetype/mpesa_setup/mpesa_setup.py +++ b/jcloud/jcloud/pagetype/mpesa_setup/mpesa_setup.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MpesaSetup(Document): +class MpesaSetup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/oauth_domain_mapping/oauth_domain_mapping.py b/jcloud/jcloud/pagetype/oauth_domain_mapping/oauth_domain_mapping.py index 454961e..cb02f60 100644 --- a/jcloud/jcloud/pagetype/oauth_domain_mapping/oauth_domain_mapping.py +++ b/jcloud/jcloud/pagetype/oauth_domain_mapping/oauth_domain_mapping.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class OAuthDomainMapping(Document): +class OAuthDomainMapping(Page): pass diff --git a/jcloud/jcloud/pagetype/order/order.py b/jcloud/jcloud/pagetype/order/order.py index efc8e06..7717460 100644 --- a/jcloud/jcloud/pagetype/order/order.py +++ b/jcloud/jcloud/pagetype/order/order.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class Order(Document): +class Order(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/partner_lead/partner_lead.py b/jcloud/jcloud/pagetype/partner_lead/partner_lead.py index 977359e..73a353e 100644 --- a/jcloud/jcloud/pagetype/partner_lead/partner_lead.py +++ b/jcloud/jcloud/pagetype/partner_lead/partner_lead.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PartnerLead(Document): +class PartnerLead(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.py b/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.py index 8ab0c34..4cde66e 100644 --- a/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.py +++ b/jcloud/jcloud/pagetype/partner_payment_payout/partner_payment_payout.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PartnerPaymentPayout(Document): +class PartnerPaymentPayout(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/partner_payment_payout_item/partner_payment_payout_item.py b/jcloud/jcloud/pagetype/partner_payment_payout_item/partner_payment_payout_item.py index 68fded7..8bf0c48 100644 --- a/jcloud/jcloud/pagetype/partner_payment_payout_item/partner_payment_payout_item.py +++ b/jcloud/jcloud/pagetype/partner_payment_payout_item/partner_payment_payout_item.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PartnerPaymentPayoutItem(Document): +class PartnerPaymentPayoutItem(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/payment_dispute/payment_dispute.py b/jcloud/jcloud/pagetype/payment_dispute/payment_dispute.py index 869bbb8..242763e 100644 --- a/jcloud/jcloud/pagetype/payment_dispute/payment_dispute.py +++ b/jcloud/jcloud/pagetype/payment_dispute/payment_dispute.py @@ -4,12 +4,12 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.telegram_message.telegram_message import TelegramMessage -class PaymentDispute(Document): +class PaymentDispute(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/payment_gateway/payment_gateway.py b/jcloud/jcloud/pagetype/payment_gateway/payment_gateway.py index f708c50..5024c6c 100644 --- a/jcloud/jcloud/pagetype/payment_gateway/payment_gateway.py +++ b/jcloud/jcloud/pagetype/payment_gateway/payment_gateway.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PaymentGateway(Document): +class PaymentGateway(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/payment_partner_transaction/payment_partner_transaction.py b/jcloud/jcloud/pagetype/payment_partner_transaction/payment_partner_transaction.py index 9b26824..c6a657d 100644 --- a/jcloud/jcloud/pagetype/payment_partner_transaction/payment_partner_transaction.py +++ b/jcloud/jcloud/pagetype/payment_partner_transaction/payment_partner_transaction.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PaymentPartnerTransaction(Document): +class PaymentPartnerTransaction(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/payout_order/payout_order.py b/jcloud/jcloud/pagetype/payout_order/payout_order.py index 3329e3b..b4c1bcd 100644 --- a/jcloud/jcloud/pagetype/payout_order/payout_order.py +++ b/jcloud/jcloud/pagetype/payout_order/payout_order.py @@ -6,14 +6,14 @@ from itertools import groupby from typing import List import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.invoice_item.invoice_item import InvoiceItem from jcloud.jcloud.pagetype.payout_order_item.payout_order_item import PayoutOrderItem from jcloud.utils import log_error -class PayoutOrder(Document): +class PayoutOrder(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/payout_order_item/payout_order_item.py b/jcloud/jcloud/pagetype/payout_order_item/payout_order_item.py index 9f91114..1ddb637 100644 --- a/jcloud/jcloud/pagetype/payout_order_item/payout_order_item.py +++ b/jcloud/jcloud/pagetype/payout_order_item/payout_order_item.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PayoutOrderItem(Document): +class PayoutOrderItem(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_backup_group/physical_backup_group.py b/jcloud/jcloud/pagetype/physical_backup_group/physical_backup_group.py index c31ebdf..c684357 100644 --- a/jcloud/jcloud/pagetype/physical_backup_group/physical_backup_group.py +++ b/jcloud/jcloud/pagetype/physical_backup_group/physical_backup_group.py @@ -4,12 +4,12 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent -class PhysicalBackupGroup(Document): +class PhysicalBackupGroup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_backup_group_site/physical_backup_group_site.py b/jcloud/jcloud/pagetype/physical_backup_group_site/physical_backup_group_site.py index b8b3814..9cdff81 100644 --- a/jcloud/jcloud/pagetype/physical_backup_group_site/physical_backup_group_site.py +++ b/jcloud/jcloud/pagetype/physical_backup_group_site/physical_backup_group_site.py @@ -7,12 +7,12 @@ import time import jingrow from jingrow.exceptions import DoesNotExistError -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent -class PhysicalBackupGroupSite(Document): +class PhysicalBackupGroupSite(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py b/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py index 57b117e..6551f3d 100644 --- a/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py +++ b/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py @@ -11,7 +11,7 @@ from enum import Enum from typing import TYPE_CHECKING, Callable import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.jcloud.pagetype.ansible_console.ansible_console import AnsibleAdHoc @@ -27,7 +27,7 @@ if TYPE_CHECKING: StepStatus = Enum("StepStatus", ["Pending", "Running", "Skipped", "Success", "Failure"]) -class PhysicalBackupRestoration(Document): +class PhysicalBackupRestoration(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_backup_restoration_step/physical_backup_restoration_step.py b/jcloud/jcloud/pagetype/physical_backup_restoration_step/physical_backup_restoration_step.py index bd79d37..86e84a7 100644 --- a/jcloud/jcloud/pagetype/physical_backup_restoration_step/physical_backup_restoration_step.py +++ b/jcloud/jcloud/pagetype/physical_backup_restoration_step/physical_backup_restoration_step.py @@ -4,10 +4,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PhysicalBackupRestorationStep(Document): +class PhysicalBackupRestorationStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_restoration_test/physical_restoration_test.py b/jcloud/jcloud/pagetype/physical_restoration_test/physical_restoration_test.py index 3635c3b..4a7c864 100644 --- a/jcloud/jcloud/pagetype/physical_restoration_test/physical_restoration_test.py +++ b/jcloud/jcloud/pagetype/physical_restoration_test/physical_restoration_test.py @@ -6,14 +6,14 @@ from __future__ import annotations from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page if TYPE_CHECKING: from jcloud.jcloud.pagetype.physical_backup_group.physical_backup_group import PhysicalBackupGroup from jcloud.jcloud.pagetype.site_update.site_update import PhysicalBackupRestoration -class PhysicalRestorationTest(Document): +class PhysicalRestorationTest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/physical_restoration_test_result/physical_restoration_test_result.py b/jcloud/jcloud/pagetype/physical_restoration_test_result/physical_restoration_test_result.py index 600a053..3b2c35d 100644 --- a/jcloud/jcloud/pagetype/physical_restoration_test_result/physical_restoration_test_result.py +++ b/jcloud/jcloud/pagetype/physical_restoration_test_result/physical_restoration_test_result.py @@ -4,10 +4,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PhysicalRestorationTestResult(Document): +class PhysicalRestorationTestResult(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/plan_change/plan_change.py b/jcloud/jcloud/pagetype/plan_change/plan_change.py index f7f70a3..cc85718 100644 --- a/jcloud/jcloud/pagetype/plan_change/plan_change.py +++ b/jcloud/jcloud/pagetype/plan_change/plan_change.py @@ -3,10 +3,10 @@ import jingrow from jingrow import _ -from jingrow.model.document import Document +from jingrow.model.page import Page -class PlanChange(Document): +class PlanChange(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/plan_feature/plan_feature.py b/jcloud/jcloud/pagetype/plan_feature/plan_feature.py index 7a8b242..55b719e 100644 --- a/jcloud/jcloud/pagetype/plan_feature/plan_feature.py +++ b/jcloud/jcloud/pagetype/plan_feature/plan_feature.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PlanFeature(Document): +class PlanFeature(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/prometheus_alert_rule/prometheus_alert_rule.py b/jcloud/jcloud/pagetype/prometheus_alert_rule/prometheus_alert_rule.py index f762c44..b8b933f 100644 --- a/jcloud/jcloud/pagetype/prometheus_alert_rule/prometheus_alert_rule.py +++ b/jcloud/jcloud/pagetype/prometheus_alert_rule/prometheus_alert_rule.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING import jingrow import yaml from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent @@ -17,7 +17,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.server.server import Server -class PrometheusAlertRule(Document): +class PrometheusAlertRule(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.py b/jcloud/jcloud/pagetype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.py index 3fcc35a..9d4d788 100644 --- a/jcloud/jcloud/pagetype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.py +++ b/jcloud/jcloud/pagetype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PrometheusAlertRuleCluster(Document): +class PrometheusAlertRuleCluster(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/proxy_server_domain/proxy_server_domain.py b/jcloud/jcloud/pagetype/proxy_server_domain/proxy_server_domain.py index 53cbea6..81f80b6 100644 --- a/jcloud/jcloud/pagetype/proxy_server_domain/proxy_server_domain.py +++ b/jcloud/jcloud/pagetype/proxy_server_domain/proxy_server_domain.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ProxyServerDomain(Document): +class ProxyServerDomain(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/razorpay_payment_record/razorpay_payment_record.py b/jcloud/jcloud/pagetype/razorpay_payment_record/razorpay_payment_record.py index 46bcb50..377630b 100644 --- a/jcloud/jcloud/pagetype/razorpay_payment_record/razorpay_payment_record.py +++ b/jcloud/jcloud/pagetype/razorpay_payment_record/razorpay_payment_record.py @@ -5,14 +5,14 @@ from __future__ import annotations from datetime import datetime, timedelta import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.team.team import _enqueue_finalize_unpaid_invoices_for_team from jcloud.utils import log_error from jcloud.utils.billing import get_razorpay_client -class RazorpayPaymentRecord(Document): +class RazorpayPaymentRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/razorpay_webhook_log/razorpay_webhook_log.py b/jcloud/jcloud/pagetype/razorpay_webhook_log/razorpay_webhook_log.py index 11200b9..5b94543 100644 --- a/jcloud/jcloud/pagetype/razorpay_webhook_log/razorpay_webhook_log.py +++ b/jcloud/jcloud/pagetype/razorpay_webhook_log/razorpay_webhook_log.py @@ -3,13 +3,13 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import log_error from jcloud.utils.billing import get_razorpay_client -class RazorpayWebhookLog(Document): +class RazorpayWebhookLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/region/region.py b/jcloud/jcloud/pagetype/region/region.py index c291a1e..f7ebbb0 100644 --- a/jcloud/jcloud/pagetype/region/region.py +++ b/jcloud/jcloud/pagetype/region/region.py @@ -3,10 +3,10 @@ # For license information, please see license.txt -from jingrow.model.document import Document +from jingrow.model.page import Page -class Region(Document): +class Region(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group/release_group.py b/jcloud/jcloud/pagetype/release_group/release_group.py index 6bf372c..09735ca 100644 --- a/jcloud/jcloud/pagetype/release_group/release_group.py +++ b/jcloud/jcloud/pagetype/release_group/release_group.py @@ -13,7 +13,7 @@ import semantic_version as sv from jingrow import _ from jingrow.core.pagetype.version.version import get_diff from jingrow.core.utils import find, find_all -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import append_number_if_name_exists from jingrow.query_builder.functions import Count from jingrow.utils import cstr, flt, get_url, sbool @@ -58,7 +58,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.deploy_candidate.deploy_candidate import DeployCandidate -class ReleaseGroup(Document, TagHelpers): +class ReleaseGroup(Page, TagHelpers): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_app/release_group_app.py b/jcloud/jcloud/pagetype/release_group_app/release_group_app.py index 3a882e4..867964a 100644 --- a/jcloud/jcloud/pagetype/release_group_app/release_group_app.py +++ b/jcloud/jcloud/pagetype/release_group_app/release_group_app.py @@ -4,13 +4,13 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cstr from jcloud.api.bench import apps -class ReleaseGroupApp(Document): +class ReleaseGroupApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_dependency/release_group_dependency.py b/jcloud/jcloud/pagetype/release_group_dependency/release_group_dependency.py index f276881..3976214 100644 --- a/jcloud/jcloud/pagetype/release_group_dependency/release_group_dependency.py +++ b/jcloud/jcloud/pagetype/release_group_dependency/release_group_dependency.py @@ -2,11 +2,11 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import is_owned_by_team -class ReleaseGroupDependency(Document): +class ReleaseGroupDependency(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_mount/release_group_mount.py b/jcloud/jcloud/pagetype/release_group_mount/release_group_mount.py index 8932344..d6d4562 100644 --- a/jcloud/jcloud/pagetype/release_group_mount/release_group_mount.py +++ b/jcloud/jcloud/pagetype/release_group_mount/release_group_mount.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ReleaseGroupMount(Document): +class ReleaseGroupMount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_package/release_group_package.py b/jcloud/jcloud/pagetype/release_group_package/release_group_package.py index 566f7c7..ac04600 100644 --- a/jcloud/jcloud/pagetype/release_group_package/release_group_package.py +++ b/jcloud/jcloud/pagetype/release_group_package/release_group_package.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ReleaseGroupPackage(Document): +class ReleaseGroupPackage(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_server/release_group_server.py b/jcloud/jcloud/pagetype/release_group_server/release_group_server.py index 709a3fb..975d81d 100644 --- a/jcloud/jcloud/pagetype/release_group_server/release_group_server.py +++ b/jcloud/jcloud/pagetype/release_group_server/release_group_server.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ReleaseGroupServer(Document): +class ReleaseGroupServer(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/release_group_variable/release_group_variable.py b/jcloud/jcloud/pagetype/release_group_variable/release_group_variable.py index 06de3c9..0d556bc 100644 --- a/jcloud/jcloud/pagetype/release_group_variable/release_group_variable.py +++ b/jcloud/jcloud/pagetype/release_group_variable/release_group_variable.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ReleaseGroupVariable(Document): +class ReleaseGroupVariable(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/remote_file/remote_file.py b/jcloud/jcloud/pagetype/remote_file/remote_file.py index efff066..34d39d9 100644 --- a/jcloud/jcloud/pagetype/remote_file/remote_file.py +++ b/jcloud/jcloud/pagetype/remote_file/remote_file.py @@ -9,7 +9,7 @@ import pprint import jingrow import requests from boto3 import client, resource -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.password import get_decrypted_password @@ -150,7 +150,7 @@ def delete_remote_backup_objects(remote_files): return remote_files -class RemoteFile(Document): +class RemoteFile(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/remote_operation_log/remote_operation_log.py b/jcloud/jcloud/pagetype/remote_operation_log/remote_operation_log.py index 3149929..f420b94 100644 --- a/jcloud/jcloud/pagetype/remote_operation_log/remote_operation_log.py +++ b/jcloud/jcloud/pagetype/remote_operation_log/remote_operation_log.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class RemoteOperationLog(Document): +class RemoteOperationLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/resource_tag/resource_tag.py b/jcloud/jcloud/pagetype/resource_tag/resource_tag.py index ee2c2a4..cbfe862 100644 --- a/jcloud/jcloud/pagetype/resource_tag/resource_tag.py +++ b/jcloud/jcloud/pagetype/resource_tag/resource_tag.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ResourceTag(Document): +class ResourceTag(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/root_domain/root_domain.py b/jcloud/jcloud/pagetype/root_domain/root_domain.py index 0fae4c5..2a2619c 100644 --- a/jcloud/jcloud/pagetype/root_domain/root_domain.py +++ b/jcloud/jcloud/pagetype/root_domain/root_domain.py @@ -10,12 +10,12 @@ import boto3 import jingrow import requests from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import log_error -class RootDomain(Document): +class RootDomain(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/scheduled_auto_update_log/scheduled_auto_update_log.py b/jcloud/jcloud/pagetype/scheduled_auto_update_log/scheduled_auto_update_log.py index e7af438..fa8b733 100644 --- a/jcloud/jcloud/pagetype/scheduled_auto_update_log/scheduled_auto_update_log.py +++ b/jcloud/jcloud/pagetype/scheduled_auto_update_log/scheduled_auto_update_log.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ScheduledAutoUpdateLog(Document): +class ScheduledAutoUpdateLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/security_update/security_update.py b/jcloud/jcloud/pagetype/security_update/security_update.py index 8a87611..80c627b 100644 --- a/jcloud/jcloud/pagetype/security_update/security_update.py +++ b/jcloud/jcloud/pagetype/security_update/security_update.py @@ -4,14 +4,14 @@ import re import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import now_datetime from jcloud.runner import Ansible from jcloud.utils import log_error -class SecurityUpdate(Document): +class SecurityUpdate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/security_update_check/security_update_check.py b/jcloud/jcloud/pagetype/security_update_check/security_update_check.py index f4836a6..50f4b5d 100644 --- a/jcloud/jcloud/pagetype/security_update_check/security_update_check.py +++ b/jcloud/jcloud/pagetype/security_update_check/security_update_check.py @@ -2,14 +2,14 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.telegram_message.telegram_message import TelegramMessage from jcloud.runner import Ansible from jcloud.utils import log_error -class SecurityUpdateCheck(Document): +class SecurityUpdateCheck(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/self_hosted_server/self_hosted_server.py b/jcloud/jcloud/pagetype/self_hosted_server/self_hosted_server.py index 03bb6f1..00e286d 100644 --- a/jcloud/jcloud/pagetype/self_hosted_server/self_hosted_server.py +++ b/jcloud/jcloud/pagetype/self_hosted_server/self_hosted_server.py @@ -6,7 +6,7 @@ from __future__ import annotations import json import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import make_autoname from jcloud.runner import Ansible @@ -15,7 +15,7 @@ from jcloud.utils import log_error # from tldextract import extract as sdext -class SelfHostedServer(Document): +class SelfHostedServer(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/self_hosted_site_apps/self_hosted_site_apps.py b/jcloud/jcloud/pagetype/self_hosted_site_apps/self_hosted_site_apps.py index 8490501..c4eb6ab 100644 --- a/jcloud/jcloud/pagetype/self_hosted_site_apps/self_hosted_site_apps.py +++ b/jcloud/jcloud/pagetype/self_hosted_site_apps/self_hosted_site_apps.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SelfHostedSiteApps(Document): +class SelfHostedSiteApps(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/serial_console_log/serial_console_log.py b/jcloud/jcloud/pagetype/serial_console_log/serial_console_log.py index 4e10a3a..efe3047 100644 --- a/jcloud/jcloud/pagetype/serial_console_log/serial_console_log.py +++ b/jcloud/jcloud/pagetype/serial_console_log/serial_console_log.py @@ -8,12 +8,12 @@ from io import StringIO import jingrow import pexpect -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.deploy_candidate.deploy_candidate import ansi_escape -class SerialConsoleLog(Document): +class SerialConsoleLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/server/server.py b/jcloud/jcloud/pagetype/server/server.py index e9fb5dc..a6f95cf 100644 --- a/jcloud/jcloud/pagetype/server/server.py +++ b/jcloud/jcloud/pagetype/server/server.py @@ -14,7 +14,7 @@ import jingrow from jingrow import _ from jingrow.core.utils import find, find_all from jingrow.installer import subprocess -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cint from jingrow.utils.user import is_system_user @@ -32,7 +32,7 @@ if typing.TYPE_CHECKING: from jcloud.jcloud.pagetype.virtual_machine.virtual_machine import VirtualMachine -class BaseServer(Document, TagHelpers): +class BaseServer(Page, TagHelpers): dashboard_fields = ( "title", "plan", diff --git a/jcloud/jcloud/pagetype/server_mount/server_mount.py b/jcloud/jcloud/pagetype/server_mount/server_mount.py index 44399e8..cc5e22f 100644 --- a/jcloud/jcloud/pagetype/server_mount/server_mount.py +++ b/jcloud/jcloud/pagetype/server_mount/server_mount.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class ServerMount(Document): +class ServerMount(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/silenced_alert/silenced_alert.py b/jcloud/jcloud/pagetype/silenced_alert/silenced_alert.py index f51b5af..204d3ff 100644 --- a/jcloud/jcloud/pagetype/silenced_alert/silenced_alert.py +++ b/jcloud/jcloud/pagetype/silenced_alert/silenced_alert.py @@ -7,13 +7,13 @@ from datetime import timezone import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.data import format_duration, get_datetime from jcloud.utils import log_error -class SilencedAlert(Document): +class SilencedAlert(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site/site.py b/jcloud/jcloud/pagetype/site/site.py index 4275e00..e6f8ab8 100644 --- a/jcloud/jcloud/pagetype/site/site.py +++ b/jcloud/jcloud/pagetype/site/site.py @@ -19,7 +19,7 @@ import requests from jingrow import _ from jingrow.core.utils import find from jingrow.jingrowclient import JingrowClient, JingrowException -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import append_number_if_name_exists from jingrow.utils import ( add_to_date, @@ -107,7 +107,7 @@ PAGETYPE_SERVER_TYPE_MAP = { } -class Site(Document, TagHelpers): +class Site(Page, TagHelpers): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -758,7 +758,7 @@ class Site(Document, TagHelpers): create_site_status_update_webhook_event(self.name) - def remove_dns_record(self, domain: Document, proxy_server: str, site: str): + def remove_dns_record(self, domain: Page, proxy_server: str, site: str): """Remove dns record of site pointing to proxy.""" _change_dns_record(method="DELETE", domain=domain, proxy_server=proxy_server, record_name=site) diff --git a/jcloud/jcloud/pagetype/site_activity/site_activity.py b/jcloud/jcloud/pagetype/site_activity/site_activity.py index a9a90dc..76b1956 100644 --- a/jcloud/jcloud/pagetype/site_activity/site_activity.py +++ b/jcloud/jcloud/pagetype/site_activity/site_activity.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteActivity(Document): +class SiteActivity(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics/site_analytics.py b/jcloud/jcloud/pagetype/site_analytics/site_analytics.py index edfe909..488811e 100644 --- a/jcloud/jcloud/pagetype/site_analytics/site_analytics.py +++ b/jcloud/jcloud/pagetype/site_analytics/site_analytics.py @@ -2,12 +2,12 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder import Interval from jingrow.query_builder.functions import Now -class SiteAnalytics(Document): +class SiteAnalytics(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics_active/site_analytics_active.py b/jcloud/jcloud/pagetype/site_analytics_active/site_analytics_active.py index 22d2f3a..9beb69e 100644 --- a/jcloud/jcloud/pagetype/site_analytics_active/site_analytics_active.py +++ b/jcloud/jcloud/pagetype/site_analytics_active/site_analytics_active.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAnalyticsActive(Document): +class SiteAnalyticsActive(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics_app/site_analytics_app.py b/jcloud/jcloud/pagetype/site_analytics_app/site_analytics_app.py index fe3cf0a..c2934eb 100644 --- a/jcloud/jcloud/pagetype/site_analytics_app/site_analytics_app.py +++ b/jcloud/jcloud/pagetype/site_analytics_app/site_analytics_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAnalyticsApp(Document): +class SiteAnalyticsApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics_login/site_analytics_login.py b/jcloud/jcloud/pagetype/site_analytics_login/site_analytics_login.py index 5e8f4ad..434a476 100644 --- a/jcloud/jcloud/pagetype/site_analytics_login/site_analytics_login.py +++ b/jcloud/jcloud/pagetype/site_analytics_login/site_analytics_login.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAnalyticsLogin(Document): +class SiteAnalyticsLogin(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics_pagetype/site_analytics_pagetype.py b/jcloud/jcloud/pagetype/site_analytics_pagetype/site_analytics_pagetype.py index 6676b2a..22348e7 100644 --- a/jcloud/jcloud/pagetype/site_analytics_pagetype/site_analytics_pagetype.py +++ b/jcloud/jcloud/pagetype/site_analytics_pagetype/site_analytics_pagetype.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAnalyticsPageType(Document): +class SiteAnalyticsPageType(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_analytics_user/site_analytics_user.py b/jcloud/jcloud/pagetype/site_analytics_user/site_analytics_user.py index 5338d9a..6baf794 100644 --- a/jcloud/jcloud/pagetype/site_analytics_user/site_analytics_user.py +++ b/jcloud/jcloud/pagetype/site_analytics_user/site_analytics_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAnalyticsUser(Document): +class SiteAnalyticsUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_app/site_app.py b/jcloud/jcloud/pagetype/site_app/site_app.py index 8fa054b..9c7d7d1 100644 --- a/jcloud/jcloud/pagetype/site_app/site_app.py +++ b/jcloud/jcloud/pagetype/site_app/site_app.py @@ -3,13 +3,13 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cstr from jcloud.api.site import get_installed_apps -class SiteApp(Document): +class SiteApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_backup/site_backup.py b/jcloud/jcloud/pagetype/site_backup/site_backup.py index 2cedc40..e0472f3 100644 --- a/jcloud/jcloud/pagetype/site_backup/site_backup.py +++ b/jcloud/jcloud/pagetype/site_backup/site_backup.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING import jingrow import jingrow.utils from jingrow.desk.pagetype.tag.tag import add_tag -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.jcloud.pagetype.ansible_console.ansible_console import AnsibleAdHoc @@ -19,7 +19,7 @@ if TYPE_CHECKING: from datetime import datetime -class SiteBackup(Document): +class SiteBackup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_config/site_config.py b/jcloud/jcloud/pagetype/site_config/site_config.py index 37634aa..a0a06c1 100644 --- a/jcloud/jcloud/pagetype/site_config/site_config.py +++ b/jcloud/jcloud/pagetype/site_config/site_config.py @@ -4,10 +4,10 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class Config(Document): +class Config(Page): dashboard_fields = ["key", "type", "value"] def get_type(self): diff --git a/jcloud/jcloud/pagetype/site_config_key/site_config_key.py b/jcloud/jcloud/pagetype/site_config_key/site_config_key.py index 0587959..3860b21 100644 --- a/jcloud/jcloud/pagetype/site_config_key/site_config_key.py +++ b/jcloud/jcloud/pagetype/site_config_key/site_config_key.py @@ -3,10 +3,10 @@ # For license information, please see license.txt -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteConfigKey(Document): +class SiteConfigKey(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_config_key_blacklist/site_config_key_blacklist.py b/jcloud/jcloud/pagetype/site_config_key_blacklist/site_config_key_blacklist.py index a8d389e..e20aa41 100644 --- a/jcloud/jcloud/pagetype/site_config_key_blacklist/site_config_key_blacklist.py +++ b/jcloud/jcloud/pagetype/site_config_key_blacklist/site_config_key_blacklist.py @@ -3,10 +3,10 @@ # For license information, please see license.txt -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteConfigKeyBlacklist(Document): +class SiteConfigKeyBlacklist(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_database_table_permission/site_database_table_permission.py b/jcloud/jcloud/pagetype/site_database_table_permission/site_database_table_permission.py index 9297660..e7a1751 100644 --- a/jcloud/jcloud/pagetype/site_database_table_permission/site_database_table_permission.py +++ b/jcloud/jcloud/pagetype/site_database_table_permission/site_database_table_permission.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteDatabaseTablePermission(Document): +class SiteDatabaseTablePermission(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_database_user/site_database_user.py b/jcloud/jcloud/pagetype/site_database_user/site_database_user.py index ed8a057..9a99d38 100644 --- a/jcloud/jcloud/pagetype/site_database_user/site_database_user.py +++ b/jcloud/jcloud/pagetype/site_database_user/site_database_user.py @@ -6,7 +6,7 @@ import re from collections import Counter import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.api.client import dashboard_whitelist @@ -14,7 +14,7 @@ from jcloud.overrides import get_permission_query_conditions_for_pagetype from jcloud.jcloud.pagetype.site_activity.site_activity import log_site_activity -class SiteDatabaseUser(Document): +class SiteDatabaseUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_domain/site_domain.py b/jcloud/jcloud/pagetype/site_domain/site_domain.py index aa44175..211ac6f 100644 --- a/jcloud/jcloud/pagetype/site_domain/site_domain.py +++ b/jcloud/jcloud/pagetype/site_domain/site_domain.py @@ -7,7 +7,7 @@ from typing import ClassVar import jingrow import rq -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.api.site import check_dns @@ -24,7 +24,7 @@ from jcloud.utils.dns import create_dns_record from jcloud.utils.jobs import has_job_timeout_exceeded -class SiteDomain(Document): +class SiteDomain(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_group_deploy/site_group_deploy.py b/jcloud/jcloud/pagetype/site_group_deploy/site_group_deploy.py index 6b98f95..fb2d174 100644 --- a/jcloud/jcloud/pagetype/site_group_deploy/site_group_deploy.py +++ b/jcloud/jcloud/pagetype/site_group_deploy/site_group_deploy.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteGroupDeploy(Document): +class SiteGroupDeploy(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_group_deploy_app/site_group_deploy_app.py b/jcloud/jcloud/pagetype/site_group_deploy_app/site_group_deploy_app.py index fbe0999..7e893f2 100644 --- a/jcloud/jcloud/pagetype/site_group_deploy_app/site_group_deploy_app.py +++ b/jcloud/jcloud/pagetype/site_group_deploy_app/site_group_deploy_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteGroupDeployApp(Document): +class SiteGroupDeployApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_migration/site_migration.py b/jcloud/jcloud/pagetype/site_migration/site_migration.py index 424fb19..27432a6 100644 --- a/jcloud/jcloud/pagetype/site_migration/site_migration.py +++ b/jcloud/jcloud/pagetype/site_migration/site_migration.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.agent import Agent from jcloud.exceptions import ( @@ -48,7 +48,7 @@ def get_ongoing_migration(site: Link, scheduled=False): return jingrow.db.exists("Site Migration", {"site": site, "status": ("in", ongoing_statuses)}) -class SiteMigration(Document): +class SiteMigration(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_migration_step/site_migration_step.py b/jcloud/jcloud/pagetype/site_migration_step/site_migration_step.py index 99f5076..ebfb6d9 100644 --- a/jcloud/jcloud/pagetype/site_migration_step/site_migration_step.py +++ b/jcloud/jcloud/pagetype/site_migration_step/site_migration_step.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteMigrationStep(Document): +class SiteMigrationStep(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_plan/plan.py b/jcloud/jcloud/pagetype/site_plan/plan.py index 50c2876..c9cd8d9 100644 --- a/jcloud/jcloud/pagetype/site_plan/plan.py +++ b/jcloud/jcloud/pagetype/site_plan/plan.py @@ -1,11 +1,11 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import rounded from jcloud.utils import group_children_in_result -class Plan(Document): +class Plan(Page): def get_price_for_interval(self, interval, currency): price_per_day = self.get_price_per_day(currency) diff --git a/jcloud/jcloud/pagetype/site_plan_allowed_app/site_plan_allowed_app.py b/jcloud/jcloud/pagetype/site_plan_allowed_app/site_plan_allowed_app.py index 2a73d71..9d3babb 100644 --- a/jcloud/jcloud/pagetype/site_plan_allowed_app/site_plan_allowed_app.py +++ b/jcloud/jcloud/pagetype/site_plan_allowed_app/site_plan_allowed_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SitePlanAllowedApp(Document): +class SitePlanAllowedApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_plan_change/site_plan_change.py b/jcloud/jcloud/pagetype/site_plan_change/site_plan_change.py index af00fce..9100a9b 100644 --- a/jcloud/jcloud/pagetype/site_plan_change/site_plan_change.py +++ b/jcloud/jcloud/pagetype/site_plan_change/site_plan_change.py @@ -5,12 +5,12 @@ from __future__ import annotations import jingrow from jingrow import _ -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils.webhook import create_webhook_event -class SitePlanChange(Document): +class SitePlanChange(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_plan_release_group/site_plan_release_group.py b/jcloud/jcloud/pagetype/site_plan_release_group/site_plan_release_group.py index 442af55..d118af4 100644 --- a/jcloud/jcloud/pagetype/site_plan_release_group/site_plan_release_group.py +++ b/jcloud/jcloud/pagetype/site_plan_release_group/site_plan_release_group.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SitePlanReleaseGroup(Document): +class SitePlanReleaseGroup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_replication/site_replication.py b/jcloud/jcloud/pagetype/site_replication/site_replication.py index ec681b3..06d07d1 100644 --- a/jcloud/jcloud/pagetype/site_replication/site_replication.py +++ b/jcloud/jcloud/pagetype/site_replication/site_replication.py @@ -4,13 +4,13 @@ from typing import List import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.site import _new from jcloud.jcloud.pagetype.site.site import prepare_site -class SiteReplication(Document): +class SiteReplication(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -70,12 +70,12 @@ class SiteReplication(Document): jingrow.log_error("Site Replication Error") @classmethod - def get_all_running_site_replications(cls) -> List[Document]: + def get_all_running_site_replications(cls) -> List[Page]: replications = jingrow.get_all(cls.pagetype, dict(status="Running"), pluck="name") return cls.get_docs(replications) @classmethod - def get_docs(cls, names: List[str]) -> List[Document]: + def get_docs(cls, names: List[str]) -> List[Page]: return [jingrow.get_pg(cls.pagetype, name) for name in names] diff --git a/jcloud/jcloud/pagetype/site_update/site_update.py b/jcloud/jcloud/pagetype/site_update/site_update.py index 7f640c7..4b2e9cf 100644 --- a/jcloud/jcloud/pagetype/site_update/site_update.py +++ b/jcloud/jcloud/pagetype/site_update/site_update.py @@ -12,7 +12,7 @@ import jingrow import jingrow.utils import pytz from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import convert_utc_to_system_timezone from jingrow.utils.caching import site_cache from jingrow.utils.data import cint @@ -32,7 +32,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.site.site import Site -class SiteUpdate(Document): +class SiteUpdate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_usage/site_usage.py b/jcloud/jcloud/pagetype/site_usage/site_usage.py index 02fd690..7add4c4 100644 --- a/jcloud/jcloud/pagetype/site_usage/site_usage.py +++ b/jcloud/jcloud/pagetype/site_usage/site_usage.py @@ -4,12 +4,12 @@ import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder import Interval from jingrow.query_builder.functions import Now -class SiteUsage(Document): +class SiteUsage(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_user/site_user.py b/jcloud/jcloud/pagetype/site_user/site_user.py index 4e9cd67..065fa10 100644 --- a/jcloud/jcloud/pagetype/site_user/site_user.py +++ b/jcloud/jcloud/pagetype/site_user/site_user.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteUser(Document): +class SiteUser(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/site_user_session/site_user_session.py b/jcloud/jcloud/pagetype/site_user_session/site_user_session.py index 7ef541d..9d49008 100644 --- a/jcloud/jcloud/pagetype/site_user_session/site_user_session.py +++ b/jcloud/jcloud/pagetype/site_user_session/site_user_session.py @@ -4,10 +4,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteUserSession(Document): +class SiteUserSession(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/sql_playground_log/sql_playground_log.py b/jcloud/jcloud/pagetype/sql_playground_log/sql_playground_log.py index a2f8935..b0d0b53 100644 --- a/jcloud/jcloud/pagetype/sql_playground_log/sql_playground_log.py +++ b/jcloud/jcloud/pagetype/sql_playground_log/sql_playground_log.py @@ -2,12 +2,12 @@ # For license information, please see license.txt from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.overrides import get_permission_query_conditions_for_pagetype -class SQLPlaygroundLog(Document): +class SQLPlaygroundLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ssh_certificate/ssh_certificate.py b/jcloud/jcloud/pagetype/ssh_certificate/ssh_certificate.py index 1f1881a..f558c72 100644 --- a/jcloud/jcloud/pagetype/ssh_certificate/ssh_certificate.py +++ b/jcloud/jcloud/pagetype/ssh_certificate/ssh_certificate.py @@ -11,7 +11,7 @@ import subprocess from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import log_error @@ -21,7 +21,7 @@ if TYPE_CHECKING: ) -class SSHCertificate(Document): +class SSHCertificate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ssh_certificate_authority/ssh_certificate_authority.py b/jcloud/jcloud/pagetype/ssh_certificate_authority/ssh_certificate_authority.py index d8dd32f..f2dafd9 100644 --- a/jcloud/jcloud/pagetype/ssh_certificate_authority/ssh_certificate_authority.py +++ b/jcloud/jcloud/pagetype/ssh_certificate_authority/ssh_certificate_authority.py @@ -8,13 +8,13 @@ import subprocess import docker import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import cint from jcloud.utils import log_error -class SSHCertificateAuthority(Document): +class SSHCertificateAuthority(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/ssh_key/ssh_key.py b/jcloud/jcloud/pagetype/ssh_key/ssh_key.py index e589d6f..9e2fadc 100644 --- a/jcloud/jcloud/pagetype/ssh_key/ssh_key.py +++ b/jcloud/jcloud/pagetype/ssh_key/ssh_key.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SSHKey(Document): +class SSHKey(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/storage_integration_bucket/storage_integration_bucket.py b/jcloud/jcloud/pagetype/storage_integration_bucket/storage_integration_bucket.py index a752fe4..70132f2 100644 --- a/jcloud/jcloud/pagetype/storage_integration_bucket/storage_integration_bucket.py +++ b/jcloud/jcloud/pagetype/storage_integration_bucket/storage_integration_bucket.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class StorageIntegrationBucket(Document): +class StorageIntegrationBucket(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/storage_integration_subscription/storage_integration_subscription.py b/jcloud/jcloud/pagetype/storage_integration_subscription/storage_integration_subscription.py index 0db17b7..8a24aa6 100644 --- a/jcloud/jcloud/pagetype/storage_integration_subscription/storage_integration_subscription.py +++ b/jcloud/jcloud/pagetype/storage_integration_subscription/storage_integration_subscription.py @@ -6,13 +6,13 @@ import math import boto3 import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.password import get_decrypted_password from jcloud.agent import Agent -class StorageIntegrationSubscription(Document): +class StorageIntegrationSubscription(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/stripe_micro_charge_record/stripe_micro_charge_record.py b/jcloud/jcloud/pagetype/stripe_micro_charge_record/stripe_micro_charge_record.py index 8aa0eb5..1b57104 100644 --- a/jcloud/jcloud/pagetype/stripe_micro_charge_record/stripe_micro_charge_record.py +++ b/jcloud/jcloud/pagetype/stripe_micro_charge_record/stripe_micro_charge_record.py @@ -2,12 +2,12 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils.billing import get_stripe -class StripeMicroChargeRecord(Document): +class StripeMicroChargeRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py b/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py index 4afa126..7ac0179 100644 --- a/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py +++ b/jcloud/jcloud/pagetype/stripe_payment_event/stripe_payment_event.py @@ -5,13 +5,13 @@ from __future__ import annotations from datetime import datetime import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils.billing import convert_stripe_money from jcloud.api.billing import get_stripe -class StripePaymentEvent(Document): +class StripePaymentEvent(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/stripe_payment_method/stripe_payment_method.py b/jcloud/jcloud/pagetype/stripe_payment_method/stripe_payment_method.py index e66e426..d18ccde 100644 --- a/jcloud/jcloud/pagetype/stripe_payment_method/stripe_payment_method.py +++ b/jcloud/jcloud/pagetype/stripe_payment_method/stripe_payment_method.py @@ -5,7 +5,7 @@ import jingrow from jingrow.contacts.address_and_contact import load_address_and_contact -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.billing import get_stripe from jcloud.api.client import dashboard_whitelist @@ -14,7 +14,7 @@ from jcloud.utils import log_error from jcloud.utils.telemetry import capture -class StripePaymentMethod(Document): +class StripePaymentMethod(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/stripe_webhook_log/stripe_webhook_log.py b/jcloud/jcloud/pagetype/stripe_webhook_log/stripe_webhook_log.py index d7e11c4..4fd5176 100644 --- a/jcloud/jcloud/pagetype/stripe_webhook_log/stripe_webhook_log.py +++ b/jcloud/jcloud/pagetype/stripe_webhook_log/stripe_webhook_log.py @@ -6,7 +6,7 @@ import re from datetime import datetime import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page import jcloud.utils from jcloud.api.billing import get_stripe @@ -16,7 +16,7 @@ class InvalidStripeWebhookEvent(Exception): http_status_code = 400 -class StripeWebhookLog(Document): +class StripeWebhookLog(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/subscription/subscription.py b/jcloud/jcloud/pagetype/subscription/subscription.py index ec185c2..8f5c055 100644 --- a/jcloud/jcloud/pagetype/subscription/subscription.py +++ b/jcloud/jcloud/pagetype/subscription/subscription.py @@ -5,7 +5,7 @@ from __future__ import annotations import jingrow import rq -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.query_builder.functions import Coalesce, Count from jingrow.utils import cint, flt @@ -15,7 +15,7 @@ from jcloud.utils import log_error from jcloud.utils.jobs import has_job_timeout_exceeded -class Subscription(Document): +class Subscription(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team/team.py b/jcloud/jcloud/pagetype/team/team.py index bf90113..85b5af8 100644 --- a/jcloud/jcloud/pagetype/team/team.py +++ b/jcloud/jcloud/pagetype/team/team.py @@ -9,7 +9,7 @@ import jingrow from jingrow import _ from jingrow.contacts.address_and_contact import load_address_and_contact from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_fullname, get_url_to_form, random_string from jcloud.api.client import dashboard_whitelist @@ -24,7 +24,7 @@ from jcloud.utils.billing import ( from jcloud.utils.telemetry import capture -class Team(Document): +class Team(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team_change/team_change.py b/jcloud/jcloud/pagetype/team_change/team_change.py index 780a340..513230d 100644 --- a/jcloud/jcloud/pagetype/team_change/team_change.py +++ b/jcloud/jcloud/pagetype/team_change/team_change.py @@ -4,10 +4,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TeamChange(Document): +class TeamChange(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team_member/team_member.py b/jcloud/jcloud/pagetype/team_member/team_member.py index 6e56921..b5113ff 100644 --- a/jcloud/jcloud/pagetype/team_member/team_member.py +++ b/jcloud/jcloud/pagetype/team_member/team_member.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TeamMember(Document): +class TeamMember(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team_member_deletion_request/team_member_deletion_request.py b/jcloud/jcloud/pagetype/team_member_deletion_request/team_member_deletion_request.py index d62a49a..d695f44 100644 --- a/jcloud/jcloud/pagetype/team_member_deletion_request/team_member_deletion_request.py +++ b/jcloud/jcloud/pagetype/team_member_deletion_request/team_member_deletion_request.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TeamMemberDeletionRequest(Document): +class TeamMemberDeletionRequest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team_member_impersonation/team_member_impersonation.py b/jcloud/jcloud/pagetype/team_member_impersonation/team_member_impersonation.py index f742471..93bdc57 100644 --- a/jcloud/jcloud/pagetype/team_member_impersonation/team_member_impersonation.py +++ b/jcloud/jcloud/pagetype/team_member_impersonation/team_member_impersonation.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TeamMemberImpersonation(Document): +class TeamMemberImpersonation(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/team_onboarding/team_onboarding.py b/jcloud/jcloud/pagetype/team_onboarding/team_onboarding.py index e44420f..6eacf07 100644 --- a/jcloud/jcloud/pagetype/team_onboarding/team_onboarding.py +++ b/jcloud/jcloud/pagetype/team_onboarding/team_onboarding.py @@ -4,10 +4,10 @@ # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TeamOnboarding(Document): +class TeamOnboarding(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/telegram_group/telegram_group.py b/jcloud/jcloud/pagetype/telegram_group/telegram_group.py index decf29f..aa1cfd6 100644 --- a/jcloud/jcloud/pagetype/telegram_group/telegram_group.py +++ b/jcloud/jcloud/pagetype/telegram_group/telegram_group.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TelegramGroup(Document): +class TelegramGroup(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/telegram_group_topic/telegram_group_topic.py b/jcloud/jcloud/pagetype/telegram_group_topic/telegram_group_topic.py index d347575..3b76b7a 100644 --- a/jcloud/jcloud/pagetype/telegram_group_topic/telegram_group_topic.py +++ b/jcloud/jcloud/pagetype/telegram_group_topic/telegram_group_topic.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class TelegramGroupTopic(Document): +class TelegramGroupTopic(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/telegram_message/telegram_message.py b/jcloud/jcloud/pagetype/telegram_message/telegram_message.py index e35b960..054b4a6 100644 --- a/jcloud/jcloud/pagetype/telegram_message/telegram_message.py +++ b/jcloud/jcloud/pagetype/telegram_message/telegram_message.py @@ -4,7 +4,7 @@ import traceback import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from telegram.error import NetworkError, RetryAfter from jcloud.telegram_utils import Telegram @@ -12,7 +12,7 @@ from jingrow.query_builder import Interval from jingrow.query_builder.functions import Now -class TelegramMessage(Document): +class TelegramMessage(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/tls_certificate/tls_certificate.py b/jcloud/jcloud/pagetype/tls_certificate/tls_certificate.py index 9927b65..4886a92 100644 --- a/jcloud/jcloud/pagetype/tls_certificate/tls_certificate.py +++ b/jcloud/jcloud/pagetype/tls_certificate/tls_certificate.py @@ -7,7 +7,7 @@ from datetime import datetime import jingrow import OpenSSL -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.site import check_dns_cname_a from jcloud.overrides import get_permission_query_conditions_for_pagetype @@ -15,7 +15,7 @@ from jcloud.runner import Ansible from jcloud.utils import get_current_team, log_error -class TLSCertificate(Document): +class TLSCertificate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/usage_record/usage_record.py b/jcloud/jcloud/pagetype/usage_record/usage_record.py index 622a632..019400d 100644 --- a/jcloud/jcloud/pagetype/usage_record/usage_record.py +++ b/jcloud/jcloud/pagetype/usage_record/usage_record.py @@ -3,10 +3,10 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class UsageRecord(Document): +class UsageRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/user_2fa/user_2fa.py b/jcloud/jcloud/pagetype/user_2fa/user_2fa.py index d20a807..bf68b6e 100644 --- a/jcloud/jcloud/pagetype/user_2fa/user_2fa.py +++ b/jcloud/jcloud/pagetype/user_2fa/user_2fa.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class User2FA(Document): +class User2FA(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py index 05b094c..5560bb5 100644 --- a/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py +++ b/jcloud/jcloud/pagetype/user_ssh_certificate/user_ssh_certificate.py @@ -12,12 +12,12 @@ import subprocess import jingrow from jingrow import safe_decode -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import log_error -class UserSSHCertificate(Document): +class UserSSHCertificate(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/user_ssh_key/user_ssh_key.py b/jcloud/jcloud/pagetype/user_ssh_key/user_ssh_key.py index f0748cc..1e14753 100644 --- a/jcloud/jcloud/pagetype/user_ssh_key/user_ssh_key.py +++ b/jcloud/jcloud/pagetype/user_ssh_key/user_ssh_key.py @@ -7,7 +7,7 @@ import struct import subprocess import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.api.client import dashboard_whitelist @@ -20,7 +20,7 @@ class SSHFingerprintError(ValueError): pass -class UserSSHKey(Document): +class UserSSHKey(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/version_upgrade/version_upgrade.py b/jcloud/jcloud/pagetype/version_upgrade/version_upgrade.py index 427f374..9c53b7c 100644 --- a/jcloud/jcloud/pagetype/version_upgrade/version_upgrade.py +++ b/jcloud/jcloud/pagetype/version_upgrade/version_upgrade.py @@ -6,7 +6,7 @@ from __future__ import annotations from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.jcloud_notification.jcloud_notification import ( create_new_notification, @@ -17,7 +17,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.site.site import Site -class VersionUpgrade(Document): +class VersionUpgrade(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -145,12 +145,12 @@ class VersionUpgrade(Document): return cls.get_docs(upgrades) @classmethod - def get_all_ongoing_version_upgrades(cls) -> list[Document]: + def get_all_ongoing_version_upgrades(cls) -> list[Page]: upgrades = jingrow.get_all(cls.pagetype, {"status": ("in", ["Pending", "Running"])}) return cls.get_docs(upgrades) @classmethod - def get_docs(cls, names: list[str]) -> list[Document]: + def get_docs(cls, names: list[str]) -> list[Page]: return [jingrow.get_pg(cls.pagetype, name) for name in names] diff --git a/jcloud/jcloud/pagetype/virtual_disk_snapshot/virtual_disk_snapshot.py b/jcloud/jcloud/pagetype/virtual_disk_snapshot/virtual_disk_snapshot.py index 538fd6f..47ef066 100644 --- a/jcloud/jcloud/pagetype/virtual_disk_snapshot/virtual_disk_snapshot.py +++ b/jcloud/jcloud/pagetype/virtual_disk_snapshot/virtual_disk_snapshot.py @@ -7,13 +7,13 @@ import jingrow import jingrow.utils import pytz from botocore.exceptions import ClientError -from jingrow.model.document import Document +from jingrow.model.page import Page from oci.core import BlockstorageClient from jcloud.utils import log_error -class VirtualDiskSnapshot(Document): +class VirtualDiskSnapshot(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/virtual_machine/virtual_machine.py b/jcloud/jcloud/pagetype/virtual_machine/virtual_machine.py index 6cca929..045684a 100644 --- a/jcloud/jcloud/pagetype/virtual_machine/virtual_machine.py +++ b/jcloud/jcloud/pagetype/virtual_machine/virtual_machine.py @@ -5,6 +5,7 @@ from __future__ import annotations import base64 import ipaddress import time +from typing import Literal import boto3 import botocore @@ -12,7 +13,7 @@ import jingrow import rq from jingrow.core.utils import find from jingrow.desk.utils import slug -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.model.naming import make_autoname from hcloud import APIException, Client from hcloud.images import Image @@ -47,7 +48,7 @@ server_pagetypes = [ ] -class VirtualMachine(Document): +class VirtualMachine(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. @@ -62,7 +63,7 @@ class VirtualMachine(Document): from jcloud.jcloud.pagetype.virtual_machine_volume.virtual_machine_volume import VirtualMachineVolume availability_zone: DF.Data - cloud_provider: DF.Literal["", "AWS EC2", "OCI", "Hetzner"] + cloud_provider: DF.Data cluster: DF.Link disk_size: DF.Int domain: DF.Link @@ -71,7 +72,7 @@ class VirtualMachine(Document): instance_id: DF.Data | None machine_image: DF.Data | None machine_type: DF.Data - platform: DF.Literal["x86_64", "arm64"] + platform: DF.Data private_dns_name: DF.Data | None private_ip_address: DF.Data | None public_dns_name: DF.Data | None @@ -80,9 +81,9 @@ class VirtualMachine(Document): region: DF.Link root_disk_size: DF.Int security_group_id: DF.Data | None - series: DF.Literal["n", "f", "m", "c", "p", "e", "r"] + series: DF.Data ssh_key: DF.Link - status: DF.Literal["Draft", "Pending", "Running", "Stopped", "Terminated"] + status: DF.Data subnet_cidr_block: DF.Data | None subnet_id: DF.Data | None team: DF.Link | None @@ -550,7 +551,7 @@ class VirtualMachine(Document): except APIException: is_deleted = True if server_instance and not is_deleted: - # cluster: Document = jingrow.get_pg("Cluster", self.cluster) + # cluster: Page = jingrow.get_pg("Cluster", self.cluster) self.status = self.get_hetzner_status_map()[server_instance.status] self.machine_type = server_instance.server_type.name self.private_ip_address = server_instance.private_net[0].ip diff --git a/jcloud/jcloud/pagetype/virtual_machine_image/virtual_machine_image.py b/jcloud/jcloud/pagetype/virtual_machine_image/virtual_machine_image.py index 42bd92b..0b54710 100644 --- a/jcloud/jcloud/pagetype/virtual_machine_image/virtual_machine_image.py +++ b/jcloud/jcloud/pagetype/virtual_machine_image/virtual_machine_image.py @@ -5,14 +5,14 @@ from __future__ import annotations import boto3 import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from oci.core import ComputeClient from oci.core.models import CreateImageDetails from tenacity import retry, stop_after_attempt, wait_fixed from tenacity.retry import retry_if_result -class VirtualMachineImage(Document): +class VirtualMachineImage(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/virtual_machine_image_volume/virtual_machine_image_volume.py b/jcloud/jcloud/pagetype/virtual_machine_image_volume/virtual_machine_image_volume.py index 13a8bc5..364af17 100644 --- a/jcloud/jcloud/pagetype/virtual_machine_image_volume/virtual_machine_image_volume.py +++ b/jcloud/jcloud/pagetype/virtual_machine_image_volume/virtual_machine_image_volume.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineImageVolume(Document): +class VirtualMachineImageVolume(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.py b/jcloud/jcloud/pagetype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.py index ea97d9c..1e2cc64 100644 --- a/jcloud/jcloud/pagetype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.py +++ b/jcloud/jcloud/pagetype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineTemporaryVolume(Document): +class VirtualMachineTemporaryVolume(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/virtual_machine_volume/virtual_machine_volume.py b/jcloud/jcloud/pagetype/virtual_machine_volume/virtual_machine_volume.py index bb6d52a..cfb2313 100644 --- a/jcloud/jcloud/pagetype/virtual_machine_volume/virtual_machine_volume.py +++ b/jcloud/jcloud/pagetype/virtual_machine_volume/virtual_machine_volume.py @@ -4,10 +4,10 @@ # import jingrow from __future__ import annotations -from jingrow.model.document import Document +from jingrow.model.page import Page -class VirtualMachineVolume(Document): +class VirtualMachineVolume(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/wechatpay_payment_record/wechatpay_payment_record.py b/jcloud/jcloud/pagetype/wechatpay_payment_record/wechatpay_payment_record.py index 11baee9..0cab551 100644 --- a/jcloud/jcloud/pagetype/wechatpay_payment_record/wechatpay_payment_record.py +++ b/jcloud/jcloud/pagetype/wechatpay_payment_record/wechatpay_payment_record.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class WechatpayPaymentRecord(Document): +class WechatpayPaymentRecord(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/jcloud/pagetype/wireguard_peer/wireguard_peer.py b/jcloud/jcloud/pagetype/wireguard_peer/wireguard_peer.py index 55dc7c4..6acc11f 100644 --- a/jcloud/jcloud/pagetype/wireguard_peer/wireguard_peer.py +++ b/jcloud/jcloud/pagetype/wireguard_peer/wireguard_peer.py @@ -6,13 +6,13 @@ import json import subprocess import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.runner import Ansible from jcloud.utils import log_error -class WireguardPeer(Document): +class WireguardPeer(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/marketplace/pagetype/app_plan_version/app_plan_version.py b/jcloud/marketplace/pagetype/app_plan_version/app_plan_version.py index f78c356..afefcee 100644 --- a/jcloud/marketplace/pagetype/app_plan_version/app_plan_version.py +++ b/jcloud/marketplace/pagetype/app_plan_version/app_plan_version.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppPlanVersion(Document): +class AppPlanVersion(Page): pass diff --git a/jcloud/marketplace/pagetype/app_release_approval_code_comments/app_release_approval_code_comments.py b/jcloud/marketplace/pagetype/app_release_approval_code_comments/app_release_approval_code_comments.py index a9596fc..0964b2c 100644 --- a/jcloud/marketplace/pagetype/app_release_approval_code_comments/app_release_approval_code_comments.py +++ b/jcloud/marketplace/pagetype/app_release_approval_code_comments/app_release_approval_code_comments.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppReleaseApprovalCodeComments(Document): +class AppReleaseApprovalCodeComments(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/marketplace/pagetype/app_user_review/app_user_review.py b/jcloud/marketplace/pagetype/app_user_review/app_user_review.py index 75a4b62..11a630a 100644 --- a/jcloud/marketplace/pagetype/app_user_review/app_user_review.py +++ b/jcloud/marketplace/pagetype/app_user_review/app_user_review.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AppUserReview(Document): +class AppUserReview(Page): def after_insert(self): self.update_average_rating() diff --git a/jcloud/marketplace/pagetype/auto_release_team/auto_release_team.py b/jcloud/marketplace/pagetype/auto_release_team/auto_release_team.py index 44e17dc..1aea503 100644 --- a/jcloud/marketplace/pagetype/auto_release_team/auto_release_team.py +++ b/jcloud/marketplace/pagetype/auto_release_team/auto_release_team.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AutoReleaseTeam(Document): +class AutoReleaseTeam(Page): pass diff --git a/jcloud/marketplace/pagetype/developer_review_reply/developer_review_reply.py b/jcloud/marketplace/pagetype/developer_review_reply/developer_review_reply.py index 9133041..f973245 100644 --- a/jcloud/marketplace/pagetype/developer_review_reply/developer_review_reply.py +++ b/jcloud/marketplace/pagetype/developer_review_reply/developer_review_reply.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class DeveloperReviewReply(Document): +class DeveloperReviewReply(Page): pass diff --git a/jcloud/marketplace/pagetype/featured_app/featured_app.py b/jcloud/marketplace/pagetype/featured_app/featured_app.py index d06cace..291adcd 100644 --- a/jcloud/marketplace/pagetype/featured_app/featured_app.py +++ b/jcloud/marketplace/pagetype/featured_app/featured_app.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class FeaturedApp(Document): +class FeaturedApp(Page): pass diff --git a/jcloud/marketplace/pagetype/marketplace_add_on/marketplace_add_on.py b/jcloud/marketplace/pagetype/marketplace_add_on/marketplace_add_on.py index 147976d..f443a43 100644 --- a/jcloud/marketplace/pagetype/marketplace_add_on/marketplace_add_on.py +++ b/jcloud/marketplace/pagetype/marketplace_add_on/marketplace_add_on.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAddOn(Document): +class MarketplaceAddOn(Page): pass diff --git a/jcloud/marketplace/pagetype/marketplace_app_payment/marketplace_app_payment.py b/jcloud/marketplace/pagetype/marketplace_app_payment/marketplace_app_payment.py index 3599b51..2c87b35 100644 --- a/jcloud/marketplace/pagetype/marketplace_app_payment/marketplace_app_payment.py +++ b/jcloud/marketplace/pagetype/marketplace_app_payment/marketplace_app_payment.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAppPayment(Document): +class MarketplaceAppPayment(Page): def has_threshold_passed(self): exchange_rate = jingrow.db.get_single_value("Jcloud Settings", "usd_rate") total = self.total_usd + (self.total_cny / exchange_rate) if exchange_rate > 0 else 80 diff --git a/jcloud/marketplace/pagetype/marketplace_app_plans/marketplace_app_plans.py b/jcloud/marketplace/pagetype/marketplace_app_plans/marketplace_app_plans.py index 2cf761c..14c8d8d 100644 --- a/jcloud/marketplace/pagetype/marketplace_app_plans/marketplace_app_plans.py +++ b/jcloud/marketplace/pagetype/marketplace_app_plans/marketplace_app_plans.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceAppPlans(Document): +class MarketplaceAppPlans(Page): pass diff --git a/jcloud/marketplace/pagetype/marketplace_app_subscription/marketplace_app_subscription.py b/jcloud/marketplace/pagetype/marketplace_app_subscription/marketplace_app_subscription.py index d5623d1..074b761 100644 --- a/jcloud/marketplace/pagetype/marketplace_app_subscription/marketplace_app_subscription.py +++ b/jcloud/marketplace/pagetype/marketplace_app_subscription/marketplace_app_subscription.py @@ -3,12 +3,12 @@ import jingrow import requests -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.site.site import Site -class MarketplaceAppSubscription(Document): +class MarketplaceAppSubscription(Page): def validate(self): self.set_secret_key() self.validate_marketplace_app_plan() diff --git a/jcloud/marketplace/pagetype/marketplace_promotional_banner/marketplace_promotional_banner.py b/jcloud/marketplace/pagetype/marketplace_promotional_banner/marketplace_promotional_banner.py index b3d26fe..89665d3 100644 --- a/jcloud/marketplace/pagetype/marketplace_promotional_banner/marketplace_promotional_banner.py +++ b/jcloud/marketplace/pagetype/marketplace_promotional_banner/marketplace_promotional_banner.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplacePromotionalBanner(Document): +class MarketplacePromotionalBanner(Page): pass diff --git a/jcloud/marketplace/pagetype/marketplace_publisher_profile/marketplace_publisher_profile.py b/jcloud/marketplace/pagetype/marketplace_publisher_profile/marketplace_publisher_profile.py index 390e2bd..0239f82 100644 --- a/jcloud/marketplace/pagetype/marketplace_publisher_profile/marketplace_publisher_profile.py +++ b/jcloud/marketplace/pagetype/marketplace_publisher_profile/marketplace_publisher_profile.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplacePublisherProfile(Document): +class MarketplacePublisherProfile(Page): pass diff --git a/jcloud/marketplace/pagetype/marketplace_settings/marketplace_settings.py b/jcloud/marketplace/pagetype/marketplace_settings/marketplace_settings.py index 2bfdc33..85663ef 100644 --- a/jcloud/marketplace/pagetype/marketplace_settings/marketplace_settings.py +++ b/jcloud/marketplace/pagetype/marketplace_settings/marketplace_settings.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class MarketplaceSettings(Document): +class MarketplaceSettings(Page): pass diff --git a/jcloud/partner/pagetype/partner_approval_request/partner_approval_request.py b/jcloud/partner/pagetype/partner_approval_request/partner_approval_request.py index ec0b2b9..1d04d22 100644 --- a/jcloud/partner/pagetype/partner_approval_request/partner_approval_request.py +++ b/jcloud/partner/pagetype/partner_approval_request/partner_approval_request.py @@ -3,13 +3,13 @@ from __future__ import annotations import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import get_url from jcloud.api.client import dashboard_whitelist -class PartnerApprovalRequest(Document): +class PartnerApprovalRequest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/partner/pagetype/partner_tier/partner_tier.py b/jcloud/partner/pagetype/partner_tier/partner_tier.py index ecaf20c..16102db 100644 --- a/jcloud/partner/pagetype/partner_tier/partner_tier.py +++ b/jcloud/partner/pagetype/partner_tier/partner_tier.py @@ -3,10 +3,10 @@ from __future__ import annotations # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class PartnerTier(Document): +class PartnerTier(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/account_request_rules/account_request_rules.py b/jcloud/saas/pagetype/account_request_rules/account_request_rules.py index d3292f3..3631657 100644 --- a/jcloud/saas/pagetype/account_request_rules/account_request_rules.py +++ b/jcloud/saas/pagetype/account_request_rules/account_request_rules.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class AccountRequestRules(Document): +class AccountRequestRules(Page): pass diff --git a/jcloud/saas/pagetype/hybrid_saas_pool/hybrid_saas_pool.py b/jcloud/saas/pagetype/hybrid_saas_pool/hybrid_saas_pool.py index eb8089a..756e304 100644 --- a/jcloud/saas/pagetype/hybrid_saas_pool/hybrid_saas_pool.py +++ b/jcloud/saas/pagetype/hybrid_saas_pool/hybrid_saas_pool.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class HybridSaasPool(Document): +class HybridSaasPool(Page): pass diff --git a/jcloud/saas/pagetype/product_trial/product_trial.py b/jcloud/saas/pagetype/product_trial/product_trial.py index 9b736d1..835d2f2 100644 --- a/jcloud/saas/pagetype/product_trial/product_trial.py +++ b/jcloud/saas/pagetype/product_trial/product_trial.py @@ -7,7 +7,7 @@ import json import jingrow import jingrow.utils -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.data import get_url from jingrow.utils.momentjs import get_all_timezones @@ -15,7 +15,7 @@ from jcloud.utils import log_error, validate_subdomain from jcloud.utils.unique_name_generator import generate as generate_random_name -class ProductTrial(Document): +class ProductTrial(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/product_trial_app/product_trial_app.py b/jcloud/saas/pagetype/product_trial_app/product_trial_app.py index 963b10c..3fd3036 100644 --- a/jcloud/saas/pagetype/product_trial_app/product_trial_app.py +++ b/jcloud/saas/pagetype/product_trial_app/product_trial_app.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ProductTrialApp(Document): +class ProductTrialApp(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/product_trial_request/product_trial_request.py b/jcloud/saas/pagetype/product_trial_request/product_trial_request.py index bc8e65b..6b6e9c4 100644 --- a/jcloud/saas/pagetype/product_trial_request/product_trial_request.py +++ b/jcloud/saas/pagetype/product_trial_request/product_trial_request.py @@ -10,7 +10,7 @@ from contextlib import suppress from typing import TYPE_CHECKING import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils.data import add_to_date, now_datetime from jingrow.utils.momentjs import get_all_timezones from jingrow.utils.password import decrypt as decrypt_password @@ -28,7 +28,7 @@ if TYPE_CHECKING: from jcloud.jcloud.pagetype.site.site import Site -class ProductTrialRequest(Document): +class ProductTrialRequest(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/product_trial_signup_field/product_trial_signup_field.py b/jcloud/saas/pagetype/product_trial_signup_field/product_trial_signup_field.py index 3b04463..5e35478 100644 --- a/jcloud/saas/pagetype/product_trial_signup_field/product_trial_signup_field.py +++ b/jcloud/saas/pagetype/product_trial_signup_field/product_trial_signup_field.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class ProductTrialSignupField(Document): +class ProductTrialSignupField(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/saas_app/saas_app.py b/jcloud/saas/pagetype/saas_app/saas_app.py index 8060169..236f031 100644 --- a/jcloud/saas/pagetype/saas_app/saas_app.py +++ b/jcloud/saas/pagetype/saas_app/saas_app.py @@ -2,13 +2,13 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.saas.pagetype.saas_app_plan.saas_app_plan import get_app_plan_features from jcloud.utils import get_current_team -class SaasApp(Document): +class SaasApp(Page): def autoname(self): self.name = self.app diff --git a/jcloud/saas/pagetype/saas_app_plan/saas_app_plan.py b/jcloud/saas/pagetype/saas_app_plan/saas_app_plan.py index d9ae18e..a42bd64 100644 --- a/jcloud/saas/pagetype/saas_app_plan/saas_app_plan.py +++ b/jcloud/saas/pagetype/saas_app_plan/saas_app_plan.py @@ -4,13 +4,13 @@ from typing import List import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.jcloud.pagetype.invoice.invoice import calculate_gst from jcloud.utils import get_current_team -class SaasAppPlan(Document): +class SaasAppPlan(Page): def validate(self): self.validate_plan() self.validate_payout_percentage() diff --git a/jcloud/saas/pagetype/saas_app_subscription/saas_app_subscription.py b/jcloud/saas/pagetype/saas_app_subscription/saas_app_subscription.py index 49a361b..7489d1b 100644 --- a/jcloud/saas/pagetype/saas_app_subscription/saas_app_subscription.py +++ b/jcloud/saas/pagetype/saas_app_subscription/saas_app_subscription.py @@ -5,13 +5,13 @@ import json from datetime import datetime import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.utils import add_to_date from jcloud.utils import log_error -class SaasAppSubscription(Document): +class SaasAppSubscription(Page): def validate(self): self.set_secret_key() self.validate_saas_app_plan() diff --git a/jcloud/saas/pagetype/saas_app_version/saas_app_version.py b/jcloud/saas/pagetype/saas_app_version/saas_app_version.py index 6af0230..2551d60 100644 --- a/jcloud/saas/pagetype/saas_app_version/saas_app_version.py +++ b/jcloud/saas/pagetype/saas_app_version/saas_app_version.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SaasAppVersion(Document): +class SaasAppVersion(Page): pass diff --git a/jcloud/saas/pagetype/saas_feedback/saas_feedback.py b/jcloud/saas/pagetype/saas_feedback/saas_feedback.py index 3f9d7b7..fd99da6 100644 --- a/jcloud/saas/pagetype/saas_feedback/saas_feedback.py +++ b/jcloud/saas/pagetype/saas_feedback/saas_feedback.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SaasFeedback(Document): +class SaasFeedback(Page): pass diff --git a/jcloud/saas/pagetype/saas_pool_rules/saas_pool_rules.py b/jcloud/saas/pagetype/saas_pool_rules/saas_pool_rules.py index 79bfff2..a9df1a8 100644 --- a/jcloud/saas/pagetype/saas_pool_rules/saas_pool_rules.py +++ b/jcloud/saas/pagetype/saas_pool_rules/saas_pool_rules.py @@ -2,8 +2,8 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SaasPoolRules(Document): +class SaasPoolRules(Page): pass diff --git a/jcloud/saas/pagetype/saas_remote_login/saas_remote_login.py b/jcloud/saas/pagetype/saas_remote_login/saas_remote_login.py index d71059d..2a8ff91 100644 --- a/jcloud/saas/pagetype/saas_remote_login/saas_remote_login.py +++ b/jcloud/saas/pagetype/saas_remote_login/saas_remote_login.py @@ -2,11 +2,11 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page EXPIRES_IN_HOURS = 6 -class SaasRemoteLogin(Document): +class SaasRemoteLogin(Page): def before_insert(self): self.expires_on = jingrow.utils.add_to_date(None, hours=EXPIRES_IN_HOURS) diff --git a/jcloud/saas/pagetype/saas_settings/saas_settings.py b/jcloud/saas/pagetype/saas_settings/saas_settings.py index 541cb6c..87d6ee4 100644 --- a/jcloud/saas/pagetype/saas_settings/saas_settings.py +++ b/jcloud/saas/pagetype/saas_settings/saas_settings.py @@ -2,10 +2,10 @@ # For license information, please see license.txt # import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SaasSettings(Document): +class SaasSettings(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/saas/pagetype/site_access_token/site_access_token.py b/jcloud/saas/pagetype/site_access_token/site_access_token.py index 5a77b50..c9375bc 100644 --- a/jcloud/saas/pagetype/site_access_token/site_access_token.py +++ b/jcloud/saas/pagetype/site_access_token/site_access_token.py @@ -2,10 +2,10 @@ # For license information, please see license.txt import jingrow -from jingrow.model.document import Document +from jingrow.model.page import Page -class SiteAccessToken(Document): +class SiteAccessToken(Page): # begin: auto-generated types # This code is auto-generated. Do not modify anything in this block. diff --git a/jcloud/tests/before_test.py b/jcloud/tests/before_test.py index d8f778e..cb06291 100644 --- a/jcloud/tests/before_test.py +++ b/jcloud/tests/before_test.py @@ -6,15 +6,15 @@ import os import jingrow from jingrow import set_user as _set_user -from jingrow.model.document import Document +from jingrow.model.page import Page from jingrow.tests.utils import JingrowTestCase from jcloud.utils import _get_current_team, _system_user -def pg_equal(self: Document, other: Document) -> bool: - """Partial equality checking of Document object""" - if not isinstance(other, Document): +def pg_equal(self: Page, other: Page) -> bool: + """Partial equality checking of Page object""" + if not isinstance(other, Page): return False if self.pagetype == other.pagetype and self.name == other.name: return True @@ -31,7 +31,7 @@ def execute(): cssutils.log.setLevel(50) # Monkey patch certain methods for when tests are running - Document.__eq__ = pg_equal + Page.__eq__ = pg_equal JingrowTestCase.setUp = lambda self: jingrow.db.truncate("Agent Request Failure") diff --git a/jcloud/utils/dns.py b/jcloud/utils/dns.py index 03a5aef..a5fd3a2 100644 --- a/jcloud/utils/dns.py +++ b/jcloud/utils/dns.py @@ -1,7 +1,7 @@ import boto3 import jingrow from jingrow.core.utils import find -from jingrow.model.document import Document +from jingrow.model.page import Page from jcloud.utils import log_error @@ -22,7 +22,7 @@ def create_dns_record(pg, record_name=None): def _change_dns_record( - method: str, domain: Document, proxy_server: str, record_name: str = None + method: str, domain: Page, proxy_server: str, record_name: str = None ): """ Change dns record of site diff --git a/jcloud/utils/webhook.py b/jcloud/utils/webhook.py index e5ad21a..3bc82a9 100644 --- a/jcloud/utils/webhook.py +++ b/jcloud/utils/webhook.py @@ -7,10 +7,10 @@ import json import jingrow from jingrow.model import default_fields -from jingrow.model.document import Document +from jingrow.model.page import Page -def create_webhook_event(event: str, payload: dict | Document, team: str) -> bool: +def create_webhook_event(event: str, payload: dict | Page, team: str) -> bool: try: # Check if team has configured webhook against this event JcloudWebhookSelectedEvent = jingrow.qb.PageType("Jcloud Webhook Selected Event") @@ -33,7 +33,7 @@ def create_webhook_event(event: str, payload: dict | Document, team: str) -> boo data = {} if isinstance(payload, dict): data = jingrow._dict(payload) - elif isinstance(payload, Document): + elif isinstance(payload, Page): data = _process_document_payload(payload) else: jingrow.throw("Invalid data type") @@ -63,7 +63,7 @@ def create_webhook_event(event: str, payload: dict | Document, team: str) -> boo return False -def _process_document_payload(payload: Document): +def _process_document_payload(payload: Page): # convert payload to dict # send fields mentioned in dashboard_fields, as other fields can have sensitive information fields = list(default_fields)