commit cb5c986f3b15138f50dbcb192d107c48ad4254c9 parent 5b98b803421b1cd8d83a681f144d62a85f44089c Author: NovaBryan <29001820+NovaBryan@users.noreply.github.com> Date: Fri, 23 Oct 2026 13:09:02 +0000 Auto-dump EVE code: 24.01.3646012 (20261023_3646012_code) Diffstat:
36 files changed, 401 insertions(+), 86 deletions(-)
diff --git a/README.md b/README.md @@ -8,6 +8,7 @@ A timeline of all version captures and synchronizations is documented here: | Update Date | Target Version Tag | Version | Notes | | :--- | :--- | :--- | :--- | +| **2026-10-23** | `eve-24_01_3646012` | 24.01.3646012 | Automated unpack and sync | | **2026-10-20** | `eve-24_01_3632936` | 24.01.3632936 | Automated unpack and sync | | **2026-10-19** | `eve-24_01_3628513` | 24.01.3628513 | Automated unpack and sync | | **2026-10-16** | `eve-24_01_3624425` | 24.01.3624425 | Automated unpack and sync | diff --git a/bugreporter/__init__.py b/bugreporter/__init__.py @@ -14,26 +14,26 @@ class BugReporter(object): if cacheFolder is None: cacheFolder = '.cache' self.cacheFolder = cacheFolder - self.logger = logging.getLogger(__name__) + self.logger = logging.getLogger('bugreporter') self.baseUrl = serverUrl def GetCategories(self): ret = [] - for each in self._HttpGet('category')['categories']: + for each in self._HttpGet('eve/issue/categories')['categories']: ret.append((each['value'], each['id'])) return ret def SendBugReport(self, categoryName, title, description, reproSteps, sessionInfo, computerInfo, userID, labels, server, build, files): data = self._GetData(categoryName, title, description, reproSteps, sessionInfo, computerInfo, userID, labels, server, build) - response = self._HttpPost('issue', data) + response = self._HttpPost('eve/issue/new', data) issueID = response['id'] self._SendAttachments(issueID, files) return response def IsBugsServiceOnline(self): try: - return self._HttpGet('status')['isOnline'] + return self._HttpGet('status/health')['isOnline'] except KeyError: return False except Exception: @@ -51,7 +51,7 @@ class BugReporter(object): def _SendAttachment(self, issueID, fileName, fileData, retries = 5): contentType, buffer = self._MultipartEncode(fileName, fileData) - urlAddition = 'attachment/{}'.format(issueID) + urlAddition = 'eve/issue/{}/attachments/add'.format(issueID) exception = None while retries > 0 or exception is None: try: @@ -100,14 +100,18 @@ class BugReporter(object): return json.loads(self._Request(urlAddition, 'GET')) def _HttpPost(self, urlAddition, data): - return json.loads(self._Request('issue', 'POST', json.dumps(data))) + return json.loads(self._Request(urlAddition, 'POST', json.dumps(data))) def _Request(self, urlAddition, method, body = None, contentType = None): self.logger.info("making a '%s' call to the bugs service '%s'", method, urlAddition) url = '{}/{}'.format(self.baseUrl, urlAddition) + self.logger.info('url: {}'.format(url)) if contentType is None: contentType = 'application/json' headers = {} + token = sm.GetService('connection').GetAccessToken() + if token is not None: + headers['Authorization'] = 'Bearer {}'.format(token) if contentType is not None: headers['Content-Type'] = contentType if method == 'GET': @@ -116,6 +120,7 @@ class BugReporter(object): resp = requests.post(url, data=body, headers=headers) else: raise RuntimeError('BugService unsupported method %s' % method) + self.logger.info('response: {}'.format(resp)) content = resp.content self.CheckResponse(resp, method) return content diff --git a/campaigns/client/errors.py b/campaigns/client/errors.py @@ -95,3 +95,9 @@ class ObjectiveStateError(RuntimeError): def __str__(self): return 'ObjectiveStateError()' + + +class CampaignObjectiveGetStatsTimeoutError(CampaignRequestError): + + def __str__(self): + return 'CampaignObjectiveGetStatsTimeoutError' diff --git a/campaigns/client/v1/messengers/campaigns_messenger.py b/campaigns/client/v1/messengers/campaigns_messenger.py @@ -2,7 +2,7 @@ import logging from campaigns.client.v1.data_model.campaign import CampaignStats, Campaign, UnredeemedReward, CampaignID from campaigns.client.v1.data_model.objective import ObjectiveParticipantStats, ObjectiveStats -from campaigns.client.errors import CampaignRequestError, CampaignNotFoundError, CampaignUnauthorizedError, CampaignBadRequestError, CampaignForbiddenError, CampaignStatsRequestError +from campaigns.client.errors import CampaignRequestError, CampaignNotFoundError, CampaignUnauthorizedError, CampaignBadRequestError, CampaignForbiddenError, CampaignStatsRequestError, CampaignObjectiveGetStatsTimeoutError from eveProto.generated.eve_public.campaign.api.requests_pb2 import GetLimitsRequest, GetLimitsResponse, GetAllRequest, GetAllResponse, GetParticipantStatsRequest, GetParticipantStatsResponse, GetStatsRequest, GetStatsResponse, GetRequest, GetResponse, GetAllUnredeemedRewardsRequest, GetAllUnredeemedRewardsResponse from eveProto.generated.eve_public.campaign.objective.api.requests_pb2 import GetStatsRequest as ObjectiveGetStatsRequest, GetStatsResponse as ObjectiveGetStatsResponse, CommitRequest, CommitResponse, ResignRequest, ResignResponse, RedeemRewardsRequest, RedeemRewardsResponse from eveProto.generated.eve_public.public_pb2 import Page @@ -167,7 +167,11 @@ class CampaignsMessenger(object): info_log = 'Request: Campaigns: ObjectiveGetStatsRequest: {request}\n'.format(request=request) try: response_primitive, response = self.public_gateway.send_blocking_character_request_and_receive_response(request_payload=request, expected_response_class=ObjectiveGetStatsResponse, timeout_seconds=4, max_attempts=2, retry_delay_in_seconds=1) - except (TimeoutException, UnpackException) as exc: + except TimeoutException as exc: + info_log += 'ERROR: %s' % exc.__class__.__name__ + logger.info(info_log) + raise CampaignObjectiveGetStatsTimeoutError('Public gateway timed out waiting for ObjectiveGetStatsResponse (timeout_seconds=4, max_attempts=2): %s' % exc) + except UnpackException as exc: info_log += 'ERROR: %s' % exc.__class__.__name__ logger.info(info_log) raise CampaignRequestError('Failed to receive response from ObjectiveGetStatsRequest: %s' % exc) diff --git a/campaigns/client/v1/repository.py b/campaigns/client/v1/repository.py @@ -11,7 +11,7 @@ from caching.client.ttl_cache import TTLCache, NO_CACHED_DATA from campaigns.client.v1.data_model.campaign import CampaignState from campaigns.client.v1.data_model.flatbuffer.campaigndefinition_serialization import serialize_campaigns_list_to_flatbuffer, deserialize_flatbuffer_to_campaigns_list from campaigns.client.v1.data_model.objective import ParticipantState, ObjectiveID -from campaigns.client.errors import CampaignRequestError +from campaigns.client.errors import CampaignRequestError, CampaignObjectiveGetStatsTimeoutError from campaigns.client.feature_flags import campaigns_polling_frequency from campaigns.client.v1.listeners.campaign_listener import CampaignListener from campaigns.client.v1.listeners.objective_listener import ObjectiveListener @@ -19,6 +19,8 @@ from campaigns.client.v1.messengers.campaigns_messenger import CampaignsMessenge from campaigns.client.v1.messengers.contribution_methods_messenger import CampaignContributionMethodsMessenger from campaigns.client.util import get_viewed_objective_ids from collections import defaultdict +from monolithsentry.client.local_error_spike_report import record_handled_failure +from monolithsentry.client.error_spike_key_consts import CAMPAIGNS_OBJECTIVE_GET_STATS_TIMEOUT from six.moves.http_client import NOT_MODIFIED from jobboard.client import ProviderType from jobboard.client.job_board_signals import on_data_primed @@ -477,6 +479,8 @@ class CampaignsRepository(object): def _request_batched_stats(self, project_ids): try: self.get_objective_stats(project_ids) + except CampaignObjectiveGetStatsTimeoutError as exc: + record_handled_failure(CAMPAIGNS_OBJECTIVE_GET_STATS_TIMEOUT, 'Objective stats poll timed out: %s' % exc) except Exception: logger.exception('Failed when getting objective stats') diff --git a/content/client/flatbuffer/repository.py b/content/client/flatbuffer/repository.py @@ -4,8 +4,12 @@ import uthread2 import blue import const import logging +import socket +from content.client.flatbuffer.errors import ServiceUnavailableError from content.client.flatbuffer.provider import FlatbufferContentProvider from content.client.repository import BaseContentRepository +from monolithsentry.client.error_spike_key_consts import FLATBUFFER_GET_UPDATE_CONNECTION_RESET, FLATBUFFER_GET_UPDATE_TIMEOUT +from monolithsentry.client.local_error_spike_report import record_handled_failure if False: from content.client.consumer import BaseContentConsumer from typing import Type @@ -88,8 +92,13 @@ class VersionCachedFlatbufferRepository(BaseContentRepository): self.on_content_updated(self.content_name) else: self.on_no_content_updated(self.content_name) - except Exception as e: - raise e + except ServiceUnavailableError as exc: + record_handled_failure(FLATBUFFER_GET_UPDATE_TIMEOUT, '%s: flatbuffer update unavailable: %s' % (self.content_name, exc)) + except Exception as exc: + if socket is not None and isinstance(exc, socket.error) and getattr(exc, 'errno', None) == 10054: + record_handled_failure(FLATBUFFER_GET_UPDATE_CONNECTION_RESET, '%s: flatbuffer update connection reset by remote host' % self.content_name) + else: + raise finally: logger.info('%s: %s', self.content_name, info_message) self._request_in_progress = False diff --git a/eve/client/script/parklife/sceneManager.py b/eve/client/script/parklife/sceneManager.py @@ -29,6 +29,7 @@ import trinity from localization import GetByLabel from trinity.sceneRenderJobSpace import DEFAULT_POSTPROCESS_PATH stdlog = logging.getLogger(__name__) +MAX_INVALID_CAMERA_FRAMES = 10 class SceneContext(): @@ -84,6 +85,7 @@ class SceneManager(Service): self.podDeathScene = None self._persistedSpaceObjects = {} self._updateCameras = [] + self._cameraInvalidFrameCounts = {} if '/skiprun' not in blue.pyos.GetArg(): self._EnableLoadingClear() limit = gfxsettings.Get(gfxsettings.GFX_LOD_QUALITY) * 30 @@ -114,9 +116,27 @@ class SceneManager(Service): try: camera._Update() except DestinyBallInvalid as e: - log.LogWarn('DestinyBallInvalid while updating camera, e=', e) + self._OnCameraUpdateInvalid(camera, e) except Exception: stdlog.error('Unexpected exception raised from UpdateCamera', exc_info=1, extra={'sample_rate': 0.01}) + else: + self._cameraInvalidFrameCounts.pop(camera, None) + + def _OnCameraUpdateInvalid(self, camera, exc): + count = self._cameraInvalidFrameCounts.get(camera, 0) + 1 + self._cameraInvalidFrameCounts[camera] = count + if count == MAX_INVALID_CAMERA_FRAMES: + stdlog.warning('Camera failed to update for %s frames, resetting it. e=%s', count, exc) + self._ResetCamera(camera) + + def _ResetCamera(self, camera): + resetCameraPosition = getattr(camera, 'ResetCameraPosition', None) + if resetCameraPosition is None: + return + try: + resetCameraPosition() + except Exception: + stdlog.exception('Failed to reset camera %s', camera) def RegisterForCameraUpdate(self, camera): if camera not in self._updateCameras: @@ -254,7 +274,12 @@ class SceneManager(Service): if camera.cameraID in INSPACE_CAMERAS: self.UpdateSceneCameraReferences(camera) if hasattr(camera, 'OnActivated'): - camera.OnActivated(lastCamera=currCam, **kwargs) + try: + camera.OnActivated(lastCamera=currCam, **kwargs) + except Exception: + stdlog.exception('Camera %s failed to activate, resetting it', camera) + self._ResetCamera(camera) + if currCam and hasattr(currCam, 'OnDeactivated') and currCam != camera: currCam.OnDeactivated() self.UpdateBracketProjectionCamera() diff --git a/eve/client/script/parklife/subwaySvc.py b/eve/client/script/parklife/subwaySvc.py @@ -87,6 +87,14 @@ class EveSpaceSubwayCamera(SpaceSubwayCamera): super(EveSpaceSubwayCamera, self).__init__() self.camera = GetSceneManager().GetOrCreateCamera(evecamera.CAM_JUMP) GetSceneManager().SetPrimaryCamera(JumpCamera.cameraID) + self._hasLoggedInvalidPosition = False + + def SetPositionAndPointOfInterest(self, newPos, newPoi): + if self.camera.SetEyeAndAtPosition(newPos, newPoi): + return + if not self._hasLoggedInvalidPosition: + self._hasLoggedInvalidPosition = True + log.warning('Jump effect produced an invalid camera position, ignoring it. pos=%r, poi=%r, %s', newPos, newPoi, self.camera) @property def position(self): @@ -207,6 +215,7 @@ class EveSpaceSubwayEffect(SpaceSubwayEffect): self.jumpInfo = jumpInfo self.killThread = None self.state = EveSpaceSubwayEffectState() + self._isCameraDetachPending = False def DisableCleanupCallback(self): self.cleanupCallbackEnabled = False @@ -261,6 +270,15 @@ class EveSpaceSubwayEffect(SpaceSubwayEffect): return lookatID def DetachCamera(self): + if not self.state.IsInDestScene() and not self.state.StartedCleaning(): + self._isCameraDetachPending = True + return + self._DetachCamera() + + def _DetachCamera(self): + self._isCameraDetachPending = False + if self.state.IsCameraDetached(): + return self.state.DetachCamera() if self.IsWithinSystem(): shipBall = sm.GetService('michelle').GetBall(session.shipid) @@ -279,6 +297,8 @@ class EveSpaceSubwayEffect(SpaceSubwayEffect): def TurnOnEndScene(self): super(EveSpaceSubwayEffect, self).TurnOnEndScene() + if self._isCameraDetachPending: + self._DetachCamera() uthread2.StartTasklet(self.PostJumpServiceCalls) self.state.EnterDestinationScene() diff --git a/eve/client/script/ui/camera/baseCamera.py b/eve/client/script/ui/camera/baseCamera.py @@ -447,18 +447,22 @@ class Camera(object): def SetZoom(self, proportion): proportion = self._ClampZoomProp(proportion) - direction = self.GetLookAtDirection() distance = self.GetZoomDistanceByZoomProportion(proportion) - zoomVec = geo2.Vec3Scale(direction, distance) - self.SetEyePosition(geo2.Vec3Add(self.GetZoomToPoint(), zoomVec)) + self._SetZoomDistance(distance) zoom = property(GetZoom, SetZoom) def SetZoomLinear(self, zoomProp): zoomProp = max(0.0, min(zoomProp, 1.0)) distance = self.maxZoom + zoomProp * (self.minZoom - self.maxZoom) - zoomVec = geo2.Vec3Scale(self.GetLookAtDirection(), distance) - self.SetEyePosition(geo2.Vec3Add(self.GetZoomToPoint(), zoomVec)) + self._SetZoomDistance(distance) + + def _SetZoomDistance(self, distance): + direction = self.GetLookAtDirection() + if IsNanVector3(direction): + return + zoomVec = geo2.Vec3Scale(direction, distance) + self.TrySetEyePosition(geo2.Vec3Add(self.GetZoomToPoint(), zoomVec)) def GetZoomLinear(self): return self.GetZoomProportionLinear() @@ -863,6 +867,18 @@ class Camera(object): eyePosition = property(GetEyePosition, SetEyePosition) + def IsValidEyePosition(self, value, atPosition = None): + if atPosition is None: + atPosition = self._atPosition + return not (IsNanVector3(value) or IsInfVector3(value)) and value != atPosition + + def TrySetEyePosition(self, value): + if not self.IsValidEyePosition(value): + logger.debug('Camera: Ignoring invalid eyePosition %r, %s', value, self) + return False + self.SetEyePosition(value) + return True + def GetAtPosition(self): return self.OffsetAtPosition(self._atPosition) diff --git a/eve/client/script/ui/camera/cameraUtil.py b/eve/client/script/ui/camera/cameraUtil.py @@ -220,12 +220,18 @@ def IsNanVector3(values): def IsInfVector3(values): for value in values: - if value > math.fabs(1e+38): + if math.fabs(value) > 1e+38: return True return False +MAX_SPACE_CAMERA_COORDINATE = 1000000000000.0 + +def IsValidSpaceCameraPosition(values): + return all((math.fabs(value) <= MAX_SPACE_CAMERA_COORDINATE for value in values)) + + def SolveQuadratic(a, b, c): d = math.sqrt(b ** 2 - 4 * a * c) x1 = -2 * c / (b + d) diff --git a/eve/client/script/ui/camera/jumpCamera.py b/eve/client/script/ui/camera/jumpCamera.py @@ -1,8 +1,11 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\eve\client\script\ui\camera\jumpCamera.py import blue from eve.client.script.ui.camera.baseSpaceCamera import BaseSpaceCamera +from eve.client.script.ui.camera.cameraUtil import IsValidSpaceCameraPosition import evecamera import geo2 +import logging +logger = logging.getLogger(__name__) class JumpCamera(BaseSpaceCamera): name = 'JumpCamera' @@ -22,12 +25,19 @@ class JumpCamera(BaseSpaceCamera): lastAtPos = lastCamera.atPosition if lastCamera.cameraID == evecamera.CAM_TACTICAL: lastAtPos = lastCamera.GetAtPositionClosestToShip() - self.SetAtPosition(lastAtPos) - self.SetEyePosition(lastCamera.eyePosition) + if not self.SetEyeAndAtPosition(lastCamera.eyePosition, lastAtPos): + logger.warning('JumpCamera: Previous camera has invalid positions, keeping current ones. %s', lastCamera) self.oldCameraZoom = super(JumpCamera, self).GetZoom() self.fov = lastCamera.fov self.SetFovTarget(self.default_fov) - self.egoPos = self.bp.GetCurrentEgoPos() + self.egoPos = self.bp.GetCurrentEgoPos() if self.bp else None + + def SetEyeAndAtPosition(self, eyePos, atPos): + if eyePos == atPos or not IsValidSpaceCameraPosition(eyePos) or not IsValidSpaceCameraPosition(atPos): + return False + self._atPosition = atPos + self.eyePosition = eyePos + return True def GetZoom(self): return self.oldCameraZoom @@ -58,9 +68,15 @@ class JumpCamera(BaseSpaceCamera): def Update(self): BaseSpaceCamera.Update(self) - if self.bp: - newPos = self.bp.GetCurrentEgoPos() - diff = geo2.Vec3SubtractD(newPos, self.egoPos) + if not self.bp: + return + newPos = self.bp.GetCurrentEgoPos() + if self.egoPos is None: self.egoPos = newPos - self.atPosition = geo2.Vec3SubtractD(self._atPosition, diff) - self.eyePosition = geo2.Vec3SubtractD(self._eyePosition, diff) + return + diff = geo2.Vec3SubtractD(newPos, self.egoPos) + self.egoPos = newPos + atPos = geo2.Vec3SubtractD(self._atPosition, diff) + eyePos = geo2.Vec3SubtractD(self._eyePosition, diff) + if not self.SetEyeAndAtPosition(eyePos, atPos): + logger.warning('JumpCamera: Ignoring ego position jump of %r, %s', diff, self) diff --git a/eve/client/script/ui/camera/shipOrbitCamera.py b/eve/client/script/ui/camera/shipOrbitCamera.py @@ -5,7 +5,7 @@ import gametime import uthread2 from eve.client.script.environment.spaceObject.spaceObject import SpaceObject from eve.client.script.parklife import states -from eve.client.script.ui.camera.cameraUtil import GetDurationByDistance, GetBallPosition, GetBall, GetBallMaxZoom, Vector3Chaser, VectorLerper, IsAutoTrackingEnabled, CheckShowModelTurrets, GetSpeedDirection, GetInitialLookAtDistance, IsDynamicCameraMovementEnabled +from eve.client.script.ui.camera.cameraUtil import GetDurationByDistance, GetBallPosition, GetBall, GetBallMaxZoom, Vector3Chaser, VectorLerper, IsAutoTrackingEnabled, CheckShowModelTurrets, GetSpeedDirection, GetInitialLookAtDistance, IsDynamicCameraMovementEnabled, IsNanVector3, IsValidSpaceCameraPosition from eve.client.script.ui.camera.baseSpaceCamera import BaseSpaceCamera import evecamera import blue @@ -63,8 +63,12 @@ class ShipOrbitCamera(BaseSpaceCamera): itemID = itemID or getattr(lastCamera, 'lastLookAtID', None) or self.ego self._SetLookAtBall(itemID) atPos1 = self.GetTrackPosition(self.lookAtBall) - eyePos1 = geo2.Vec3Add(atPos1, geo2.Vec3Scale(lastCamera.GetLookAtDirection(), self.GetInitialZoomDist(lastCamera))) - if lastCamera.cameraID in (evecamera.CAM_TACTICAL, + direction = lastCamera.GetLookAtDirection() + if IsNanVector3(direction): + direction = geo2.Vec3Direction(self.default_eyePosition, self.default_atPosition) + eyePos1 = geo2.Vec3Add(atPos1, geo2.Vec3Scale(direction, self.GetInitialZoomDist(lastCamera))) + canTransitFromLastCamera = IsValidSpaceCameraPosition(lastCamera.atPosition) and IsValidSpaceCameraPosition(lastCamera.eyePosition) + if canTransitFromLastCamera and lastCamera.cameraID in (evecamera.CAM_TACTICAL, evecamera.CAM_JUMP, evecamera.CAM_UNDOCK, evecamera.CAM_ENTERSPACE, @@ -265,13 +269,13 @@ class ShipOrbitCamera(BaseSpaceCamera): atDiff = geo2.Vec3Subtract(newAtPos, self._atPosition) self.SetAtPosition(newAtPos) if self.IsChasing(): - self.SetEyePosition(self.trackLerper.GetValue(self._eyePosition, self.GetChaseEyePosition())) + self.TrySetEyePosition(self.trackLerper.GetValue(self._eyePosition, self.GetChaseEyePosition())) elif self.IsTracking(): - self.SetEyePosition(self.trackLerper.GetValue(self._eyePosition, self.GetTrackingEyePosition())) + self.TrySetEyePosition(self.trackLerper.GetValue(self._eyePosition, self.GetTrackingEyePosition())) else: prop = self._GetEyePosDriftProporition() eyeOffset = geo2.Vec3Scale(atDiff, prop) - self.SetEyePosition(geo2.Vec3Add(self._eyePosition, eyeOffset)) + self.TrySetEyePosition(geo2.Vec3Add(self._eyePosition, eyeOffset)) if not self.IsInTransit(): if self.GetItemID() == self.ego or self.IsTracking() or self.IsChasing(): self.SetZoom(zoomProp) @@ -288,6 +292,8 @@ class ShipOrbitCamera(BaseSpaceCamera): def GetTrackingEyePosition(self): trackPos = self.GetTrackPosition(self.trackBall) direction = geo2.Vec3Subtract(self._atPosition, trackPos) + if geo2.Vec3Length(direction) == 0.0: + direction = self.GetLookAtDirection() direction = geo2.Vec3Normalize(direction) offset = geo2.Vec3Scale(direction, self.GetZoomDistance()) return geo2.Vec3Add(self._atPosition, offset) diff --git a/eve/client/script/ui/services/bugReporting.py b/eve/client/script/ui/services/bugReporting.py @@ -68,7 +68,7 @@ COLOR_BLUE = (0.0, ARROW_HEIGHT = 28 BASEFONTSIZE = 18 NUMFONTSIZE = 26 -BUGREPORT_SERVER = 'https://bugsservice.eveonline.com/api' +BUGREPORT_SERVER = 'https://ebr-service.ccpeveweb.com/v1' BUG_REPORTS_URL = 'https://community.eveonline.com/support/bug-reports/my-bug-reports/' BUG_GUIDE_URL = 'https://community.eveonline.com/support/test-servers/bug-reporting/' SCREENSHOT_NAME = 'igbr_%s.jpg' diff --git a/eveProto/generated/eve/campaign/parameter/parameter_pb2.py b/eveProto/generated/eve/campaign/parameter/parameter_pb2.py @@ -5,7 +5,7 @@ from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() from eveProto.generated.eve.campaign.ui import ui_pb2 as eve_dot_campaign_dot_ui_dot_ui__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/parameter/parameter.proto', package='eve.campaign.parameter', syntax='proto3', serialized_options='ZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/parameter', create_key=_descriptor._internal_create_key, serialized_pb='\n&eve/campaign/parameter/parameter.proto\x12\x16eve.campaign.parameter\x1a\x18eve/campaign/ui/ui.proto"\xc7\x03\n\nDefinition\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\'\n\x02ui\x18\x02 \x01(\x0b2\x1b.eve.campaign.ui.Definition\x12O\n\x0csingle_value\x18\x03 \x01(\x0b27.eve.campaign.parameter.Definition.SingleValueParameterH\x00\x12>\n\x03set\x18\x04 \x01(\x0b2/.eve.campaign.parameter.Definition.SetParameterH\x00\x12]\n\x14multi_value_type_set\x18\x05 \x01(\x0b2=.eve.campaign.parameter.Definition.MultiValueTypeSetParameterH\x00\x1a*\n\x14SingleValueParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a"\n\x0cSetParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a:\n\x1aMultiValueTypeSetParameter\x12\x1c\n\x14accepted_value_types\x18\x01 \x03(\tB\x07\n\x05class"\xa0\x05\n\rConfiguration\x12\x0b\n\x03key\x18\x01 \x01(\t\x12I\n\x0csingle_value\x18\x03 \x01(\x0b21.eve.campaign.parameter.Configuration.SingleValueH\x00\x12C\n\tset_value\x18\x04 \x01(\x0b2..eve.campaign.parameter.Configuration.SetValueH\x00\x12b\n\x1amulti_value_type_set_value\x18\x05 \x01(\x0b2<.eve.campaign.parameter.Configuration.MultiValueTypeSetValueH\x00\x1ao\n\x05Value\x12\x11\n\x07literal\x18\x01 \x01(\tH\x00\x12\x12\n\x08wildcard\x18\x02 \x01(\x08H\x00\x126\n\treference\x18\x03 \x01(\x0b2!.eve.campaign.parameter.ReferenceH\x00B\x07\n\x05value\x1a]\n\x0bSingleValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b2+.eve.campaign.parameter.Configuration.Value\x1a[\n\x08SetValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12;\n\x06values\x18\x02 \x03(\x0b2+.eve.campaign.parameter.Configuration.Value\x1aX\n\x16MultiValueTypeSetValue\x12>\n\x06values\x18\x01 \x03(\x0b2..eve.campaign.parameter.Configuration.SetValueB\x07\n\x05class"\xaf\x01\n\tReference\x128\n\x06entity\x18\x01 \x01(\x0e2(.eve.campaign.parameter.Reference.Entity\x12\x0b\n\x03key\x18\x02 \x01(\t"[\n\x06Entity\x12\x16\n\x12ENTITY_UNSPECIFIED\x10\x00\x12\x13\n\x0fENTITY_INSTANCE\x10\x01\x12\x10\n\x0cENTITY_MATCH\x10\x02\x12\x12\n\x0eENTITY_TRIGGER\x10\x03BCZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/parameterb\x06proto3', dependencies=[eve_dot_campaign_dot_ui_dot_ui__pb2.DESCRIPTOR]) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/campaign/parameter/parameter.proto', package='eve.campaign.parameter', syntax='proto3', serialized_options='ZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/parameter', create_key=_descriptor._internal_create_key, serialized_pb='\n&eve/campaign/parameter/parameter.proto\x12\x16eve.campaign.parameter\x1a\x18eve/campaign/ui/ui.proto"\xc7\x03\n\nDefinition\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\'\n\x02ui\x18\x02 \x01(\x0b2\x1b.eve.campaign.ui.Definition\x12O\n\x0csingle_value\x18\x03 \x01(\x0b27.eve.campaign.parameter.Definition.SingleValueParameterH\x00\x12>\n\x03set\x18\x04 \x01(\x0b2/.eve.campaign.parameter.Definition.SetParameterH\x00\x12]\n\x14multi_value_type_set\x18\x05 \x01(\x0b2=.eve.campaign.parameter.Definition.MultiValueTypeSetParameterH\x00\x1a*\n\x14SingleValueParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a"\n\x0cSetParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a:\n\x1aMultiValueTypeSetParameter\x12\x1c\n\x14accepted_value_types\x18\x01 \x03(\tB\x07\n\x05class"\xa0\x05\n\rConfiguration\x12\x0b\n\x03key\x18\x01 \x01(\t\x12I\n\x0csingle_value\x18\x02 \x01(\x0b21.eve.campaign.parameter.Configuration.SingleValueH\x00\x12C\n\tset_value\x18\x03 \x01(\x0b2..eve.campaign.parameter.Configuration.SetValueH\x00\x12b\n\x1amulti_value_type_set_value\x18\x04 \x01(\x0b2<.eve.campaign.parameter.Configuration.MultiValueTypeSetValueH\x00\x1ao\n\x05Value\x12\x11\n\x07literal\x18\x01 \x01(\tH\x00\x12\x12\n\x08wildcard\x18\x02 \x01(\x08H\x00\x126\n\treference\x18\x03 \x01(\x0b2!.eve.campaign.parameter.ReferenceH\x00B\x07\n\x05value\x1a]\n\x0bSingleValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b2+.eve.campaign.parameter.Configuration.Value\x1a[\n\x08SetValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12;\n\x06values\x18\x02 \x03(\x0b2+.eve.campaign.parameter.Configuration.Value\x1aX\n\x16MultiValueTypeSetValue\x12>\n\x06values\x18\x01 \x03(\x0b2..eve.campaign.parameter.Configuration.SetValueB\x07\n\x05class"\xaf\x01\n\tReference\x128\n\x06entity\x18\x01 \x01(\x0e2(.eve.campaign.parameter.Reference.Entity\x12\x0b\n\x03key\x18\x02 \x01(\t"[\n\x06Entity\x12\x16\n\x12ENTITY_UNSPECIFIED\x10\x00\x12\x13\n\x0fENTITY_INSTANCE\x10\x01\x12\x10\n\x0cENTITY_MATCH\x10\x02\x12\x12\n\x0eENTITY_TRIGGER\x10\x03BCZAgithub.com/ccpgames/eve-proto-go/generated/eve/campaign/parameterb\x06proto3', dependencies=[eve_dot_campaign_dot_ui_dot_ui__pb2.DESCRIPTOR]) _REFERENCE_ENTITY = _descriptor.EnumDescriptor(name='Entity', full_name='eve.campaign.parameter.Reference.Entity', filename=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key, values=[_descriptor.EnumValueDescriptor(name='ENTITY_UNSPECIFIED', index=0, number=0, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='ENTITY_INSTANCE', index=1, number=1, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='ENTITY_MATCH', index=2, number=2, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), @@ -24,9 +24,9 @@ _CONFIGURATION_SINGLEVALUE = _descriptor.Descriptor(name='SingleValue', full_nam _CONFIGURATION_SETVALUE = _descriptor.Descriptor(name='SetValue', full_name='eve.campaign.parameter.Configuration.SetValue', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='value_type', full_name='eve.campaign.parameter.Configuration.SetValue.value_type', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='values', full_name='eve.campaign.parameter.Configuration.SetValue.values', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1033, serialized_end=1124) _CONFIGURATION_MULTIVALUETYPESETVALUE = _descriptor.Descriptor(name='MultiValueTypeSetValue', full_name='eve.campaign.parameter.Configuration.MultiValueTypeSetValue', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='values', full_name='eve.campaign.parameter.Configuration.MultiValueTypeSetValue.values', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1126, serialized_end=1214) _CONFIGURATION = _descriptor.Descriptor(name='Configuration', full_name='eve.campaign.parameter.Configuration', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='key', full_name='eve.campaign.parameter.Configuration.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='single_value', full_name='eve.campaign.parameter.Configuration.single_value', index=1, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='set_value', full_name='eve.campaign.parameter.Configuration.set_value', index=2, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='multi_value_type_set_value', full_name='eve.campaign.parameter.Configuration.multi_value_type_set_value', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_CONFIGURATION_VALUE, + _descriptor.FieldDescriptor(name='single_value', full_name='eve.campaign.parameter.Configuration.single_value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='set_value', full_name='eve.campaign.parameter.Configuration.set_value', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='multi_value_type_set_value', full_name='eve.campaign.parameter.Configuration.multi_value_type_set_value', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_CONFIGURATION_VALUE, _CONFIGURATION_SINGLEVALUE, _CONFIGURATION_SETVALUE, _CONFIGURATION_MULTIVALUETYPESETVALUE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='class', full_name='eve.campaign.parameter.Configuration.class', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=551, serialized_end=1223) diff --git a/eveProto/generated/eve/space/api/events_pb2.py b/eveProto/generated/eve/space/api/events_pb2.py @@ -5,12 +5,14 @@ from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() from eveProto.generated.eve import semanticversion_pb2 as eve_dot_semanticversion__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/space/api/events.proto', package='eve.space.api', syntax='proto3', serialized_options='Z8github.com/ccpgames/eve-proto-go/generated/eve/space/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1aeve/space/api/events.proto\x12\reve.space.api\x1a\x19eve/semanticversion.proto"\x1d\n\x1bCleanupExpiredTagsCommanded"P\n\x19LoadUniverseDataCommanded\x123\n\x07version\x18\x01 \x01(\x0b2".eve.semanticversion.SpecificationB:Z8github.com/ccpgames/eve-proto-go/generated/eve/space/apib\x06proto3', dependencies=[eve_dot_semanticversion__pb2.DESCRIPTOR]) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/space/api/events.proto', package='eve.space.api', syntax='proto3', serialized_options='Z8github.com/ccpgames/eve-proto-go/generated/eve/space/api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1aeve/space/api/events.proto\x12\reve.space.api\x1a\x19eve/semanticversion.proto"\x1d\n\x1bCleanupExpiredTagsCommanded"P\n\x19LoadUniverseDataCommanded\x123\n\x07version\x18\x01 \x01(\x0b2".eve.semanticversion.Specification"$\n"EnsureCorrectAuthoredTagsCommandedB:Z8github.com/ccpgames/eve-proto-go/generated/eve/space/apib\x06proto3', dependencies=[eve_dot_semanticversion__pb2.DESCRIPTOR]) _CLEANUPEXPIREDTAGSCOMMANDED = _descriptor.Descriptor(name='CleanupExpiredTagsCommanded', full_name='eve.space.api.CleanupExpiredTagsCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=72, serialized_end=101) _LOADUNIVERSEDATACOMMANDED = _descriptor.Descriptor(name='LoadUniverseDataCommanded', full_name='eve.space.api.LoadUniverseDataCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='version', full_name='eve.space.api.LoadUniverseDataCommanded.version', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=103, serialized_end=183) +_ENSURECORRECTAUTHOREDTAGSCOMMANDED = _descriptor.Descriptor(name='EnsureCorrectAuthoredTagsCommanded', full_name='eve.space.api.EnsureCorrectAuthoredTagsCommanded', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=185, serialized_end=221) _LOADUNIVERSEDATACOMMANDED.fields_by_name['version'].message_type = eve_dot_semanticversion__pb2._SPECIFICATION DESCRIPTOR.message_types_by_name['CleanupExpiredTagsCommanded'] = _CLEANUPEXPIREDTAGSCOMMANDED DESCRIPTOR.message_types_by_name['LoadUniverseDataCommanded'] = _LOADUNIVERSEDATACOMMANDED +DESCRIPTOR.message_types_by_name['EnsureCorrectAuthoredTagsCommanded'] = _ENSURECORRECTAUTHOREDTAGSCOMMANDED _sym_db.RegisterFileDescriptor(DESCRIPTOR) CleanupExpiredTagsCommanded = _reflection.GeneratedProtocolMessageType('CleanupExpiredTagsCommanded', (_message.Message,), {'DESCRIPTOR': _CLEANUPEXPIREDTAGSCOMMANDED, '__module__': 'eve.space.api.events_pb2'}) @@ -18,4 +20,7 @@ _sym_db.RegisterMessage(CleanupExpiredTagsCommanded) LoadUniverseDataCommanded = _reflection.GeneratedProtocolMessageType('LoadUniverseDataCommanded', (_message.Message,), {'DESCRIPTOR': _LOADUNIVERSEDATACOMMANDED, '__module__': 'eve.space.api.events_pb2'}) _sym_db.RegisterMessage(LoadUniverseDataCommanded) +EnsureCorrectAuthoredTagsCommanded = _reflection.GeneratedProtocolMessageType('EnsureCorrectAuthoredTagsCommanded', (_message.Message,), {'DESCRIPTOR': _ENSURECORRECTAUTHOREDTAGSCOMMANDED, + '__module__': 'eve.space.api.events_pb2'}) +_sym_db.RegisterMessage(EnsureCorrectAuthoredTagsCommanded) DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/store/targetaudience/offer/price_pb2.py b/eveProto/generated/eve/store/targetaudience/offer/price_pb2.py @@ -5,13 +5,13 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor(name='eve/store/targetaudience/offer/price.proto', package='eve.store.targetaudience.offer', syntax='proto3', serialized_options='ZIgithub.com/ccpgames/eve-proto-go/generated/eve/store/targetaudience/offer', create_key=_descriptor._internal_create_key, serialized_pb='\n*eve/store/targetaudience/offer/price.proto\x12\x1eeve.store.targetaudience.offer"f\n\x0fPriceInCurrency\x12:\n\x08currency\x18\x01 \x01(\x0e2(.eve.store.targetaudience.offer.Currency\x12\x17\n\x0famount_in_cents\x18\x02 \x01(\x03"$\n\tPlexPrice\x12\x17\n\x0famount_in_cents\x18\x01 \x01(\x03"\x80\x02\n\x05Price\x12\x0e\n\x04free\x18\x01 \x01(\x08H\x00\x12I\n\x10real_money_price\x18\x02 \x01(\x0b2-.eve.store.targetaudience.offer.Price.PayableH\x00\x12?\n\nplex_price\x18\x03 \x01(\x0b2).eve.store.targetaudience.offer.PlexPriceH\x00\x1aJ\n\x07Payable\x12?\n\x06prices\x18\x01 \x03(\x0b2/.eve.store.targetaudience.offer.PriceInCurrencyB\x0f\n\rprice_details*~\n\x08Currency\x12\x18\n\x14CURRENCY_UNSPECIFIED\x10\x00\x12\x10\n\x0cCURRENCY_EUR\x10\x01\x12\x10\n\x0cCURRENCY_GBP\x10\x02\x12\x10\n\x0cCURRENCY_JPY\x10\x03\x12\x10\n\x0cCURRENCY_RUB\x10\x04\x12\x10\n\x0cCURRENCY_USD\x10\x05BKZIgithub.com/ccpgames/eve-proto-go/generated/eve/store/targetaudience/offerb\x06proto3') +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/store/targetaudience/offer/price.proto', package='eve.store.targetaudience.offer', syntax='proto3', serialized_options='ZIgithub.com/ccpgames/eve-proto-go/generated/eve/store/targetaudience/offer', create_key=_descriptor._internal_create_key, serialized_pb='\n*eve/store/targetaudience/offer/price.proto\x12\x1eeve.store.targetaudience.offer"f\n\x0fPriceInCurrency\x12:\n\x08currency\x18\x01 \x01(\x0e2(.eve.store.targetaudience.offer.Currency\x12\x17\n\x0famount_in_cents\x18\x02 \x01(\x03"$\n\tPlexPrice\x12\x17\n\x0famount_in_cents\x18\x01 \x01(\x03"\xf0\x03\n\x05Price\x12\x0e\n\x04free\x18\x01 \x01(\x08H\x00\x12I\n\x10real_money_price\x18\x02 \x01(\x0b2-.eve.store.targetaudience.offer.Price.PayableH\x00\x12?\n\nplex_price\x18\x03 \x01(\x0b2).eve.store.targetaudience.offer.PlexPriceH\x00\x12Q\n\x0fcomposite_price\x18\x04 \x01(\x0b26.eve.store.targetaudience.offer.Price.CompositePayableH\x00\x1aJ\n\x07Payable\x12?\n\x06prices\x18\x01 \x03(\x0b2/.eve.store.targetaudience.offer.PriceInCurrency\x1a\x9a\x01\n\x10CompositePayable\x12G\n\x10real_money_price\x18\x01 \x01(\x0b2-.eve.store.targetaudience.offer.Price.Payable\x12=\n\nplex_price\x18\x02 \x01(\x0b2).eve.store.targetaudience.offer.PlexPriceB\x0f\n\rprice_details*~\n\x08Currency\x12\x18\n\x14CURRENCY_UNSPECIFIED\x10\x00\x12\x10\n\x0cCURRENCY_EUR\x10\x01\x12\x10\n\x0cCURRENCY_GBP\x10\x02\x12\x10\n\x0cCURRENCY_JPY\x10\x03\x12\x10\n\x0cCURRENCY_RUB\x10\x04\x12\x10\n\x0cCURRENCY_USD\x10\x05BKZIgithub.com/ccpgames/eve-proto-go/generated/eve/store/targetaudience/offerb\x06proto3') _CURRENCY = _descriptor.EnumDescriptor(name='Currency', full_name='eve.store.targetaudience.offer.Currency', filename=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key, values=[_descriptor.EnumValueDescriptor(name='CURRENCY_UNSPECIFIED', index=0, number=0, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_EUR', index=1, number=1, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_GBP', index=2, number=2, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_JPY', index=3, number=3, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_RUB', index=4, number=4, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor(name='CURRENCY_USD', index=5, number=5, serialized_options=None, type=None, create_key=_descriptor._internal_create_key)], containing_type=None, serialized_options=None, serialized_start=479, serialized_end=605) + _descriptor.EnumValueDescriptor(name='CURRENCY_USD', index=5, number=5, serialized_options=None, type=None, create_key=_descriptor._internal_create_key)], containing_type=None, serialized_options=None, serialized_start=719, serialized_end=845) _sym_db.RegisterEnumDescriptor(_CURRENCY) Currency = enum_type_wrapper.EnumTypeWrapper(_CURRENCY) CURRENCY_UNSPECIFIED = 0 @@ -22,19 +22,29 @@ CURRENCY_RUB = 4 CURRENCY_USD = 5 _PRICEINCURRENCY = _descriptor.Descriptor(name='PriceInCurrency', full_name='eve.store.targetaudience.offer.PriceInCurrency', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='currency', full_name='eve.store.targetaudience.offer.PriceInCurrency.currency', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='amount_in_cents', full_name='eve.store.targetaudience.offer.PriceInCurrency.amount_in_cents', index=1, number=2, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=78, serialized_end=180) _PLEXPRICE = _descriptor.Descriptor(name='PlexPrice', full_name='eve.store.targetaudience.offer.PlexPrice', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='amount_in_cents', full_name='eve.store.targetaudience.offer.PlexPrice.amount_in_cents', index=0, number=1, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=182, serialized_end=218) -_PRICE_PAYABLE = _descriptor.Descriptor(name='Payable', full_name='eve.store.targetaudience.offer.Price.Payable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='prices', full_name='eve.store.targetaudience.offer.Price.Payable.prices', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=386, serialized_end=460) -_PRICE = _descriptor.Descriptor(name='Price', full_name='eve.store.targetaudience.offer.Price', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='free', full_name='eve.store.targetaudience.offer.Price.free', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='real_money_price', full_name='eve.store.targetaudience.offer.Price.real_money_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='plex_price', full_name='eve.store.targetaudience.offer.Price.plex_price', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_PRICE_PAYABLE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='price_details', full_name='eve.store.targetaudience.offer.Price.price_details', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=221, serialized_end=477) +_PRICE_PAYABLE = _descriptor.Descriptor(name='Payable', full_name='eve.store.targetaudience.offer.Price.Payable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='prices', full_name='eve.store.targetaudience.offer.Price.Payable.prices', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=469, serialized_end=543) +_PRICE_COMPOSITEPAYABLE = _descriptor.Descriptor(name='CompositePayable', full_name='eve.store.targetaudience.offer.Price.CompositePayable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='real_money_price', full_name='eve.store.targetaudience.offer.Price.CompositePayable.real_money_price', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='plex_price', full_name='eve.store.targetaudience.offer.Price.CompositePayable.plex_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=546, serialized_end=700) +_PRICE = _descriptor.Descriptor(name='Price', full_name='eve.store.targetaudience.offer.Price', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='free', full_name='eve.store.targetaudience.offer.Price.free', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='real_money_price', full_name='eve.store.targetaudience.offer.Price.real_money_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='plex_price', full_name='eve.store.targetaudience.offer.Price.plex_price', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='composite_price', full_name='eve.store.targetaudience.offer.Price.composite_price', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_PRICE_PAYABLE, _PRICE_COMPOSITEPAYABLE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='price_details', full_name='eve.store.targetaudience.offer.Price.price_details', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=221, serialized_end=717) _PRICEINCURRENCY.fields_by_name['currency'].enum_type = _CURRENCY _PRICE_PAYABLE.fields_by_name['prices'].message_type = _PRICEINCURRENCY _PRICE_PAYABLE.containing_type = _PRICE +_PRICE_COMPOSITEPAYABLE.fields_by_name['real_money_price'].message_type = _PRICE_PAYABLE +_PRICE_COMPOSITEPAYABLE.fields_by_name['plex_price'].message_type = _PLEXPRICE +_PRICE_COMPOSITEPAYABLE.containing_type = _PRICE _PRICE.fields_by_name['real_money_price'].message_type = _PRICE_PAYABLE _PRICE.fields_by_name['plex_price'].message_type = _PLEXPRICE +_PRICE.fields_by_name['composite_price'].message_type = _PRICE_COMPOSITEPAYABLE _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['free']) _PRICE.fields_by_name['free'].containing_oneof = _PRICE.oneofs_by_name['price_details'] _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['real_money_price']) _PRICE.fields_by_name['real_money_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['plex_price']) _PRICE.fields_by_name['plex_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] +_PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['composite_price']) +_PRICE.fields_by_name['composite_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] DESCRIPTOR.message_types_by_name['PriceInCurrency'] = _PRICEINCURRENCY DESCRIPTOR.message_types_by_name['PlexPrice'] = _PLEXPRICE DESCRIPTOR.message_types_by_name['Price'] = _PRICE @@ -48,8 +58,11 @@ PlexPrice = _reflection.GeneratedProtocolMessageType('PlexPrice', (_message.Mess _sym_db.RegisterMessage(PlexPrice) Price = _reflection.GeneratedProtocolMessageType('Price', (_message.Message,), {'Payable': _reflection.GeneratedProtocolMessageType('Payable', (_message.Message,), {'DESCRIPTOR': _PRICE_PAYABLE, '__module__': 'eve.store.targetaudience.offer.price_pb2'}), + 'CompositePayable': _reflection.GeneratedProtocolMessageType('CompositePayable', (_message.Message,), {'DESCRIPTOR': _PRICE_COMPOSITEPAYABLE, + '__module__': 'eve.store.targetaudience.offer.price_pb2'}), 'DESCRIPTOR': _PRICE, '__module__': 'eve.store.targetaudience.offer.price_pb2'}) _sym_db.RegisterMessage(Price) _sym_db.RegisterMessage(Price.Payable) +_sym_db.RegisterMessage(Price.CompositePayable) DESCRIPTOR._options = None diff --git a/eveProto/generated/eve/user/tag/api/events_pb2.py b/eveProto/generated/eve/user/tag/api/events_pb2.py @@ -0,0 +1,26 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\eveProto\generated\eve\user\tag\api\events_pb2.py +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +_sym_db = _symbol_database.Default() +from eveProto.generated.eve.user import user_pb2 as eve_dot_user_dot_user__pb2 +DESCRIPTOR = _descriptor.FileDescriptor(name='eve/user/tag/api/events.proto', package='eve.user.tag.api', syntax='proto3', serialized_options='Z;github.com/ccpgames/eve-proto-go/generated/eve/user/tag/api\xaa\x02\x11Eve.User.Tags.Api', create_key=_descriptor._internal_create_key, serialized_pb='\n\x1deve/user/tag/api/events.proto\x12\x10eve.user.tag.api\x1a\x13eve/user/user.proto"q\n\x06Tagged\x12$\n\x06tagged\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12\x1b\n\x04tags\x18\x02 \x01(\x0b2\r.eve.user.Tag\x12$\n\x06tagger\x18\x03 \x01(\x0b2\x14.eve.user.Identifier"t\n\x08Untagged\x12$\n\x06tagged\x18\x01 \x01(\x0b2\x14.eve.user.Identifier\x12\x1a\n\x03tag\x18\x02 \x01(\x0b2\r.eve.user.Tag\x12&\n\x08untagger\x18\x03 \x01(\x0b2\x14.eve.user.IdentifierBQZ;github.com/ccpgames/eve-proto-go/generated/eve/user/tag/api\xaa\x02\x11Eve.User.Tags.Apib\x06proto3', dependencies=[eve_dot_user_dot_user__pb2.DESCRIPTOR]) +_TAGGED = _descriptor.Descriptor(name='Tagged', full_name='eve.user.tag.api.Tagged', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='tagged', full_name='eve.user.tag.api.Tagged.tagged', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tags', full_name='eve.user.tag.api.Tagged.tags', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tagger', full_name='eve.user.tag.api.Tagged.tagger', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=72, serialized_end=185) +_UNTAGGED = _descriptor.Descriptor(name='Untagged', full_name='eve.user.tag.api.Untagged', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='tagged', full_name='eve.user.tag.api.Untagged.tagged', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tag', full_name='eve.user.tag.api.Untagged.tag', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='untagger', full_name='eve.user.tag.api.Untagged.untagger', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=187, serialized_end=303) +_TAGGED.fields_by_name['tagged'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_TAGGED.fields_by_name['tags'].message_type = eve_dot_user_dot_user__pb2._TAG +_TAGGED.fields_by_name['tagger'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_UNTAGGED.fields_by_name['tagged'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +_UNTAGGED.fields_by_name['tag'].message_type = eve_dot_user_dot_user__pb2._TAG +_UNTAGGED.fields_by_name['untagger'].message_type = eve_dot_user_dot_user__pb2._IDENTIFIER +DESCRIPTOR.message_types_by_name['Tagged'] = _TAGGED +DESCRIPTOR.message_types_by_name['Untagged'] = _UNTAGGED +_sym_db.RegisterFileDescriptor(DESCRIPTOR) +Tagged = _reflection.GeneratedProtocolMessageType('Tagged', (_message.Message,), {'DESCRIPTOR': _TAGGED, + '__module__': 'eve.user.tag.api.events_pb2'}) +_sym_db.RegisterMessage(Tagged) +Untagged = _reflection.GeneratedProtocolMessageType('Untagged', (_message.Message,), {'DESCRIPTOR': _UNTAGGED, + '__module__': 'eve.user.tag.api.events_pb2'}) +_sym_db.RegisterMessage(Untagged) +DESCRIPTOR._options = None diff --git a/eveProto/generated/eve_public/campaign/api/requests_pb2.py b/eveProto/generated/eve_public/campaign/api/requests_pb2.py @@ -12,7 +12,7 @@ from eveProto.generated.eve_public.campaign.ui import ui_pb2 as eve__public_dot_ from eveProto.generated.eve_public.career import career_pb2 as eve__public_dot_career_dot_career__pb2 from eveProto.generated.eve_public import public_pb2 as eve__public_dot_public__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/api/requests.proto', package='eve_public.campaign.api', syntax='proto3', serialized_options='ZBgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/api', create_key=_descriptor._internal_create_key, serialized_pb='\n&eve_public/campaign/api/requests.proto\x12\x17eve_public.campaign.api\x1a"eve_public/campaign/campaign.proto\x1aBeve_public/campaign/contributionmethod/definition/definition.proto\x1a-eve_public/campaign/objective/objective.proto\x1a%eve_public/campaign/track/track.proto\x1a\x1feve_public/campaign/ui/ui.proto\x1a\x1eeve_public/career/career.proto\x1a\x17eve_public/public.proto\x1a\x1fgoogle/protobuf/timestamp.proto"N\n\x19GetAllForNamespaceRequest\x121\n\tnamespace\x18\x01 \x01(\x0b2\x1e.eve_public.campaign.Namespace"\xba\x02\n\x1aGetAllForNamespaceResponse\x122\n\tcampaigns\x18\x01 \x03(\x0b2\x1f.eve_public.campaign.Identifier\x12X\n\x12upcoming_campaigns\x18\x02 \x03(\x0b2<.eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming\x1a\x8d\x01\n\x08Upcoming\x12\x17\n\x0fdefinition_name\x18\x01 \x01(\t\x12.\n\x02ui\x18\x02 \x01(\x0b2".eve_public.campaign.ui.Definition\x128\n\x14scheduled_start_time\x18\x03 \x01(\x0b2\x1a.google.protobuf.Timestamp"\x99\x01\n\nGetRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier\x12\x14\n\nno_version\x18\x02 \x01(\x08H\x00\x12/\n\x07version\x18\x03 \x01(\x0b2\x1c.eve_public.campaign.VersionH\x00B\x11\n\x0fcurrent_version"\x82\x08\n\x0bGetResponse\x123\n\nattributes\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Attributes\x12)\n\x05stats\x18\x04 \x01(\x0b2\x1a.eve_public.campaign.Stats\x12:\n\x06tracks\x18\x05 \x03(\x0b2*.eve_public.campaign.api.GetResponse.Track\x12=\n\nobjectives\x18\x06 \x03(\x0b2).eve_public.campaign.objective.Identifier\x12D\n\x13upcoming_objectives\x18\x07 \x03(\x0b2\'.eve_public.campaign.objective.Upcoming\x12Y\n\x14available_objectives\x18\x02 \x03(\x0b27.eve_public.campaign.api.GetResponse.AvailableObjectiveB\x02\x18\x01\x12[\n\x15restricted_objectives\x18\x03 \x03(\x0b28.eve_public.campaign.api.GetResponse.RestrictedObjectiveB\x02\x18\x01\x1a\xa6\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x129\n\nattributes\x18\x02 \x01(\x0b2%.eve_public.campaign.track.Attributes\x12/\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.Stats\x1a\x95\x01\n\x12AvailableObjective\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12=\n\nattributes\x18\x02 \x01(\x0b2).eve_public.campaign.objective.Attributes:\x02\x18\x01\x1a\xd8\x01\n\x13RestrictedObjective\x128\n\x14scheduled_start_time\x18\x01 \x01(\x0b2\x1a.google.protobuf.Timestamp\x12\'\n\x06career\x18\x02 \x01(\x0e2\x17.eve_public.career.Path\x12Z\n\x13contribution_method\x18\x03 \x01(\x0b2=.eve_public.campaign.contributionmethod.definition.Identifier:\x02\x18\x01"E\n\x10GetStatusRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier"\xdc\x02\n\x11GetStatusResponse\x122\n\x05state\x18\x01 \x01(\x0b2#.eve_public.campaign.LifecycleState\x12)\n\x05stats\x18\x02 \x01(\x0b2\x1a.eve_public.campaign.Stats\x12@\n\x06tracks\x18\x03 \x03(\x0b20.eve_public.campaign.api.GetStatusResponse.Track\x1a\xa5\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x128\n\x05state\x18\x02 \x01(\x0b2).eve_public.campaign.track.LifecycleState\x12/\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.Stats"~\n)GetAllUnredeemedParticipantRewardsRequest\x121\n\tnamespace\x18\x01 \x01(\x0b2\x1e.eve_public.campaign.Namespace\x12\x1e\n\x04page\x18\x02 \x01(\x0b2\x10.eve_public.Page"\x9f\x03\n*GetAllUnredeemedParticipantRewardsResponse\x12j\n\x06tracks\x18\x01 \x03(\x0b2Z.eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards\x12\'\n\tnext_page\x18\x02 \x01(\x0b2\x14.eve_public.NextPage\x1a\xdb\x01\n\x16TrackUnredeemedRewards\x124\n\x05track\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x12"\n\x18isk_intervals_unredeemed\x18\x02 \x01(\x04H\x00\x12\x1b\n\x11no_isk_unredeemed\x18\x03 \x01(\x08H\x00\x12!\n\x17lp_intervals_unredeemed\x18\x04 \x01(\x04H\x01\x12\x1a\n\x10no_lp_unredeemed\x18\x05 \x01(\x08H\x01B\x05\n\x03iskB\x04\n\x02lp"\x12\n\x10GetLimitsRequest"B\n\x11GetLimitsResponse\x12-\n%max_active_objectives_per_participant\x18\x01 \x01(\r"\x13\n\rGetAllRequest:\x02\x18\x01"H\n\x0eGetAllResponse\x122\n\tcampaigns\x18\x01 \x03(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"H\n\x0fGetStatsRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"\xa3\x02\n\x10GetStatsResponse\x122\n\x0ecampaign_stats\x18\x01 \x01(\x0b2\x1a.eve_public.campaign.Stats\x12Q\n\x0fobjective_stats\x18\x02 \x03(\x0b28.eve_public.campaign.api.GetStatsResponse.ObjectiveStats\x1a\x83\x01\n\x0eObjectiveStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats:\x02\x18\x01"S\n\x1aGetParticipantStatsRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"\x96\x02\n\x1bGetParticipantStatsResponse\x12`\n\x11participant_stats\x18\x01 \x03(\x0b2E.eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats\x1a\x90\x01\n\x10ParticipantStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12>\n\x05stats\x18\x02 \x01(\x0b2/.eve_public.campaign.objective.ParticipantStats:\x02\x18\x01"D\n\x1eGetAllUnredeemedRewardsRequest\x12\x1e\n\x04page\x18\x01 \x01(\x0b2\x10.eve_public.Page:\x02\x18\x01"\xff\x02\n\x1fGetAllUnredeemedRewardsResponse\x12V\n\nobjectives\x18\x01 \x03(\x0b2B.eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective\x12\'\n\tnext_page\x18\x02 \x01(\x0b2\x14.eve_public.NextPage\x1a\xd6\x01\n\tObjective\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12"\n\x18isk_intervals_unredeemed\x18\x02 \x01(\x04H\x00\x12\x1b\n\x11no_isk_unredeemed\x18\x03 \x01(\x08H\x00\x12!\n\x17lp_intervals_unredeemed\x18\x04 \x01(\x04H\x01\x12\x1a\n\x10no_lp_unredeemed\x18\x05 \x01(\x08H\x01B\x05\n\x03iskB\x04\n\x02lp:\x02\x18\x01BDZBgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/apib\x06proto3', dependencies=[eve__public_dot_campaign_dot_campaign__pb2.DESCRIPTOR, +DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/api/requests.proto', package='eve_public.campaign.api', syntax='proto3', serialized_options='ZBgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/api', create_key=_descriptor._internal_create_key, serialized_pb='\n&eve_public/campaign/api/requests.proto\x12\x17eve_public.campaign.api\x1a"eve_public/campaign/campaign.proto\x1aBeve_public/campaign/contributionmethod/definition/definition.proto\x1a-eve_public/campaign/objective/objective.proto\x1a%eve_public/campaign/track/track.proto\x1a\x1feve_public/campaign/ui/ui.proto\x1a\x1eeve_public/career/career.proto\x1a\x17eve_public/public.proto\x1a\x1fgoogle/protobuf/timestamp.proto"N\n\x19GetAllForNamespaceRequest\x121\n\tnamespace\x18\x01 \x01(\x0b2\x1e.eve_public.campaign.Namespace"\xba\x02\n\x1aGetAllForNamespaceResponse\x122\n\tcampaigns\x18\x01 \x03(\x0b2\x1f.eve_public.campaign.Identifier\x12X\n\x12upcoming_campaigns\x18\x02 \x03(\x0b2<.eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming\x1a\x8d\x01\n\x08Upcoming\x12\x17\n\x0fdefinition_name\x18\x01 \x01(\t\x12.\n\x02ui\x18\x02 \x01(\x0b2".eve_public.campaign.ui.Definition\x128\n\x14scheduled_start_time\x18\x03 \x01(\x0b2\x1a.google.protobuf.Timestamp"\x99\x01\n\nGetRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier\x12\x14\n\nno_version\x18\x02 \x01(\x08H\x00\x12/\n\x07version\x18\x03 \x01(\x0b2\x1c.eve_public.campaign.VersionH\x00B\x11\n\x0fcurrent_version"\x8a\x08\n\x0bGetResponse\x123\n\nattributes\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Attributes\x12:\n\x06tracks\x18\x04 \x03(\x0b2*.eve_public.campaign.api.GetResponse.Track\x12=\n\nobjectives\x18\x05 \x03(\x0b2).eve_public.campaign.objective.Identifier\x12D\n\x13upcoming_objectives\x18\x06 \x03(\x0b2\'.eve_public.campaign.objective.Upcoming\x12-\n\x05stats\x18\x07 \x01(\x0b2\x1a.eve_public.campaign.StatsB\x02\x18\x01\x12Y\n\x14available_objectives\x18\x02 \x03(\x0b27.eve_public.campaign.api.GetResponse.AvailableObjectiveB\x02\x18\x01\x12[\n\x15restricted_objectives\x18\x03 \x03(\x0b28.eve_public.campaign.api.GetResponse.RestrictedObjectiveB\x02\x18\x01\x1a\xaa\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x129\n\nattributes\x18\x02 \x01(\x0b2%.eve_public.campaign.track.Attributes\x123\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.StatsB\x02\x18\x01\x1a\x95\x01\n\x12AvailableObjective\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12=\n\nattributes\x18\x02 \x01(\x0b2).eve_public.campaign.objective.Attributes:\x02\x18\x01\x1a\xd8\x01\n\x13RestrictedObjective\x128\n\x14scheduled_start_time\x18\x01 \x01(\x0b2\x1a.google.protobuf.Timestamp\x12\'\n\x06career\x18\x02 \x01(\x0e2\x17.eve_public.career.Path\x12Z\n\x13contribution_method\x18\x03 \x01(\x0b2=.eve_public.campaign.contributionmethod.definition.Identifier:\x02\x18\x01"E\n\x10GetStatusRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier"\xdc\x02\n\x11GetStatusResponse\x122\n\x05state\x18\x01 \x01(\x0b2#.eve_public.campaign.LifecycleState\x12)\n\x05stats\x18\x02 \x01(\x0b2\x1a.eve_public.campaign.Stats\x12@\n\x06tracks\x18\x03 \x03(\x0b20.eve_public.campaign.api.GetStatusResponse.Track\x1a\xa5\x01\n\x05Track\x121\n\x02id\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x128\n\x05state\x18\x02 \x01(\x0b2).eve_public.campaign.track.LifecycleState\x12/\n\x05stats\x18\x03 \x01(\x0b2 .eve_public.campaign.track.Stats"~\n)GetAllUnredeemedParticipantRewardsRequest\x121\n\tnamespace\x18\x01 \x01(\x0b2\x1e.eve_public.campaign.Namespace\x12\x1e\n\x04page\x18\x02 \x01(\x0b2\x10.eve_public.Page"\x9f\x03\n*GetAllUnredeemedParticipantRewardsResponse\x12j\n\x06tracks\x18\x01 \x03(\x0b2Z.eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards\x12\'\n\tnext_page\x18\x02 \x01(\x0b2\x14.eve_public.NextPage\x1a\xdb\x01\n\x16TrackUnredeemedRewards\x124\n\x05track\x18\x01 \x01(\x0b2%.eve_public.campaign.track.Identifier\x12"\n\x18isk_intervals_unredeemed\x18\x02 \x01(\x04H\x00\x12\x1b\n\x11no_isk_unredeemed\x18\x03 \x01(\x08H\x00\x12!\n\x17lp_intervals_unredeemed\x18\x04 \x01(\x04H\x01\x12\x1a\n\x10no_lp_unredeemed\x18\x05 \x01(\x08H\x01B\x05\n\x03iskB\x04\n\x02lp"\x12\n\x10GetLimitsRequest"B\n\x11GetLimitsResponse\x12-\n%max_active_objectives_per_participant\x18\x01 \x01(\r"\x13\n\rGetAllRequest:\x02\x18\x01"H\n\x0eGetAllResponse\x122\n\tcampaigns\x18\x01 \x03(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"H\n\x0fGetStatsRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"\xa3\x02\n\x10GetStatsResponse\x122\n\x0ecampaign_stats\x18\x01 \x01(\x0b2\x1a.eve_public.campaign.Stats\x12Q\n\x0fobjective_stats\x18\x02 \x03(\x0b28.eve_public.campaign.api.GetStatsResponse.ObjectiveStats\x1a\x83\x01\n\x0eObjectiveStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x123\n\x05stats\x18\x02 \x01(\x0b2$.eve_public.campaign.objective.Stats:\x02\x18\x01"S\n\x1aGetParticipantStatsRequest\x121\n\x08campaign\x18\x01 \x01(\x0b2\x1f.eve_public.campaign.Identifier:\x02\x18\x01"\x96\x02\n\x1bGetParticipantStatsResponse\x12`\n\x11participant_stats\x18\x01 \x03(\x0b2E.eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats\x1a\x90\x01\n\x10ParticipantStats\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12>\n\x05stats\x18\x02 \x01(\x0b2/.eve_public.campaign.objective.ParticipantStats:\x02\x18\x01"D\n\x1eGetAllUnredeemedRewardsRequest\x12\x1e\n\x04page\x18\x01 \x01(\x0b2\x10.eve_public.Page:\x02\x18\x01"\xff\x02\n\x1fGetAllUnredeemedRewardsResponse\x12V\n\nobjectives\x18\x01 \x03(\x0b2B.eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective\x12\'\n\tnext_page\x18\x02 \x01(\x0b2\x14.eve_public.NextPage\x1a\xd6\x01\n\tObjective\x12<\n\tobjective\x18\x01 \x01(\x0b2).eve_public.campaign.objective.Identifier\x12"\n\x18isk_intervals_unredeemed\x18\x02 \x01(\x04H\x00\x12\x1b\n\x11no_isk_unredeemed\x18\x03 \x01(\x08H\x00\x12!\n\x17lp_intervals_unredeemed\x18\x04 \x01(\x04H\x01\x12\x1a\n\x10no_lp_unredeemed\x18\x05 \x01(\x08H\x01B\x05\n\x03iskB\x04\n\x02lp:\x02\x18\x01BDZBgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/apib\x06proto3', dependencies=[eve__public_dot_campaign_dot_campaign__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_contributionmethod_dot_definition_dot_definition__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_objective_dot_objective__pb2.DESCRIPTOR, eve__public_dot_campaign_dot_track_dot_track__pb2.DESCRIPTOR, @@ -24,43 +24,43 @@ _GETALLFORNAMESPACEREQUEST = _descriptor.Descriptor(name='GetAllForNamespaceRequ _GETALLFORNAMESPACERESPONSE_UPCOMING = _descriptor.Descriptor(name='Upcoming', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='definition_name', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming.definition_name', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='ui', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming.ui', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='scheduled_start_time', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.Upcoming.scheduled_start_time', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=634, serialized_end=775) _GETALLFORNAMESPACERESPONSE = _descriptor.Descriptor(name='GetAllForNamespaceResponse', full_name='eve_public.campaign.api.GetAllForNamespaceResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaigns', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.campaigns', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='upcoming_campaigns', full_name='eve_public.campaign.api.GetAllForNamespaceResponse.upcoming_campaigns', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETALLFORNAMESPACERESPONSE_UPCOMING], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=461, serialized_end=775) _GETREQUEST = _descriptor.Descriptor(name='GetRequest', full_name='eve_public.campaign.api.GetRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='no_version', full_name='eve_public.campaign.api.GetRequest.no_version', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='version', full_name='eve_public.campaign.api.GetRequest.version', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='current_version', full_name='eve_public.campaign.api.GetRequest.current_version', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=778, serialized_end=931) -_GETRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.api.GetResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.api.GetResponse.Track.id', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.api.GetResponse.Track.attributes', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetResponse.Track.stats', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1423, serialized_end=1589) -_GETRESPONSE_AVAILABLEOBJECTIVE = _descriptor.Descriptor(name='AvailableObjective', full_name='eve_public.campaign.api.GetResponse.AvailableObjective', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetResponse.AvailableObjective.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.api.GetResponse.AvailableObjective.attributes', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1592, serialized_end=1741) -_GETRESPONSE_RESTRICTEDOBJECTIVE = _descriptor.Descriptor(name='RestrictedObjective', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='scheduled_start_time', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.scheduled_start_time', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='career', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.career', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='contribution_method', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.contribution_method', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1744, serialized_end=1960) +_GETRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.api.GetResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.api.GetResponse.Track.id', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.api.GetResponse.Track.attributes', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetResponse.Track.stats', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options='\x18\x01', file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1427, serialized_end=1597) +_GETRESPONSE_AVAILABLEOBJECTIVE = _descriptor.Descriptor(name='AvailableObjective', full_name='eve_public.campaign.api.GetResponse.AvailableObjective', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetResponse.AvailableObjective.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.api.GetResponse.AvailableObjective.attributes', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1600, serialized_end=1749) +_GETRESPONSE_RESTRICTEDOBJECTIVE = _descriptor.Descriptor(name='RestrictedObjective', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='scheduled_start_time', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.scheduled_start_time', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='career', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.career', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='contribution_method', full_name='eve_public.campaign.api.GetResponse.RestrictedObjective.contribution_method', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1752, serialized_end=1968) _GETRESPONSE = _descriptor.Descriptor(name='GetResponse', full_name='eve_public.campaign.api.GetResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='attributes', full_name='eve_public.campaign.api.GetResponse.attributes', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetResponse.stats', index=1, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetResponse.tracks', index=2, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='objectives', full_name='eve_public.campaign.api.GetResponse.objectives', index=3, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='upcoming_objectives', full_name='eve_public.campaign.api.GetResponse.upcoming_objectives', index=4, number=7, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetResponse.tracks', index=1, number=4, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='objectives', full_name='eve_public.campaign.api.GetResponse.objectives', index=2, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='upcoming_objectives', full_name='eve_public.campaign.api.GetResponse.upcoming_objectives', index=3, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetResponse.stats', index=4, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options='\x18\x01', file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='available_objectives', full_name='eve_public.campaign.api.GetResponse.available_objectives', index=5, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options='\x18\x01', file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='restricted_objectives', full_name='eve_public.campaign.api.GetResponse.restricted_objectives', index=6, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options='\x18\x01', file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETRESPONSE_TRACK, _GETRESPONSE_AVAILABLEOBJECTIVE, _GETRESPONSE_RESTRICTEDOBJECTIVE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=934, serialized_end=1960) -_GETSTATUSREQUEST = _descriptor.Descriptor(name='GetStatusRequest', full_name='eve_public.campaign.api.GetStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetStatusRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1962, serialized_end=2031) -_GETSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.api.GetStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.api.GetStatusResponse.Track.id', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.api.GetStatusResponse.Track.state', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatusResponse.Track.stats', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2217, serialized_end=2382) -_GETSTATUSRESPONSE = _descriptor.Descriptor(name='GetStatusResponse', full_name='eve_public.campaign.api.GetStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.api.GetStatusResponse.state', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatusResponse.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetStatusResponse.tracks', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2034, serialized_end=2382) -_GETALLUNREDEEMEDPARTICIPANTREWARDSREQUEST = _descriptor.Descriptor(name='GetAllUnredeemedParticipantRewardsRequest', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='namespace', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest.namespace', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='page', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest.page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2384, serialized_end=2510) + _descriptor.FieldDescriptor(name='restricted_objectives', full_name='eve_public.campaign.api.GetResponse.restricted_objectives', index=6, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options='\x18\x01', file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETRESPONSE_TRACK, _GETRESPONSE_AVAILABLEOBJECTIVE, _GETRESPONSE_RESTRICTEDOBJECTIVE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=934, serialized_end=1968) +_GETSTATUSREQUEST = _descriptor.Descriptor(name='GetStatusRequest', full_name='eve_public.campaign.api.GetStatusRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetStatusRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1970, serialized_end=2039) +_GETSTATUSRESPONSE_TRACK = _descriptor.Descriptor(name='Track', full_name='eve_public.campaign.api.GetStatusResponse.Track', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='id', full_name='eve_public.campaign.api.GetStatusResponse.Track.id', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.api.GetStatusResponse.Track.state', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatusResponse.Track.stats', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2225, serialized_end=2390) +_GETSTATUSRESPONSE = _descriptor.Descriptor(name='GetStatusResponse', full_name='eve_public.campaign.api.GetStatusResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='state', full_name='eve_public.campaign.api.GetStatusResponse.state', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatusResponse.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetStatusResponse.tracks', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETSTATUSRESPONSE_TRACK], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2042, serialized_end=2390) +_GETALLUNREDEEMEDPARTICIPANTREWARDSREQUEST = _descriptor.Descriptor(name='GetAllUnredeemedParticipantRewardsRequest', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='namespace', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest.namespace', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='page', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsRequest.page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2392, serialized_end=2518) _GETALLUNREDEEMEDPARTICIPANTREWARDSRESPONSE_TRACKUNREDEEMEDREWARDS = _descriptor.Descriptor(name='TrackUnredeemedRewards', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='track', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.track', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='isk_intervals_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.isk_intervals_unredeemed', index=1, number=2, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='no_isk_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.no_isk_unredeemed', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='lp_intervals_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.lp_intervals_unredeemed', index=3, number=4, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='no_lp_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.no_lp_unredeemed', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='isk', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.isk', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[]), _descriptor.OneofDescriptor(name='lp', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.lp', index=1, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=2709, serialized_end=2928) -_GETALLUNREDEEMEDPARTICIPANTREWARDSRESPONSE = _descriptor.Descriptor(name='GetAllUnredeemedParticipantRewardsResponse', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.tracks', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='next_page', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.next_page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETALLUNREDEEMEDPARTICIPANTREWARDSRESPONSE_TRACKUNREDEEMEDREWARDS], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2513, serialized_end=2928) -_GETLIMITSREQUEST = _descriptor.Descriptor(name='GetLimitsRequest', full_name='eve_public.campaign.api.GetLimitsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2930, serialized_end=2948) -_GETLIMITSRESPONSE = _descriptor.Descriptor(name='GetLimitsResponse', full_name='eve_public.campaign.api.GetLimitsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='max_active_objectives_per_participant', full_name='eve_public.campaign.api.GetLimitsResponse.max_active_objectives_per_participant', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2950, serialized_end=3016) -_GETALLREQUEST = _descriptor.Descriptor(name='GetAllRequest', full_name='eve_public.campaign.api.GetAllRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3018, serialized_end=3037) -_GETALLRESPONSE = _descriptor.Descriptor(name='GetAllResponse', full_name='eve_public.campaign.api.GetAllResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaigns', full_name='eve_public.campaign.api.GetAllResponse.campaigns', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3039, serialized_end=3111) -_GETSTATSREQUEST = _descriptor.Descriptor(name='GetStatsRequest', full_name='eve_public.campaign.api.GetStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetStatsRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3113, serialized_end=3185) -_GETSTATSRESPONSE_OBJECTIVESTATS = _descriptor.Descriptor(name='ObjectiveStats', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3344, serialized_end=3475) -_GETSTATSRESPONSE = _descriptor.Descriptor(name='GetStatsResponse', full_name='eve_public.campaign.api.GetStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign_stats', full_name='eve_public.campaign.api.GetStatsResponse.campaign_stats', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='objective_stats', full_name='eve_public.campaign.api.GetStatsResponse.objective_stats', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETSTATSRESPONSE_OBJECTIVESTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3188, serialized_end=3479) -_GETPARTICIPANTSTATSREQUEST = _descriptor.Descriptor(name='GetParticipantStatsRequest', full_name='eve_public.campaign.api.GetParticipantStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetParticipantStatsRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3481, serialized_end=3564) -_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS = _descriptor.Descriptor(name='ParticipantStats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3697, serialized_end=3841) -_GETPARTICIPANTSTATSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatsResponse', full_name='eve_public.campaign.api.GetParticipantStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='participant_stats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.participant_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3567, serialized_end=3845) -_GETALLUNREDEEMEDREWARDSREQUEST = _descriptor.Descriptor(name='GetAllUnredeemedRewardsRequest', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='page', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsRequest.page', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3847, serialized_end=3915) + _descriptor.FieldDescriptor(name='no_lp_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.no_lp_unredeemed', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='isk', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.isk', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[]), _descriptor.OneofDescriptor(name='lp', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.TrackUnredeemedRewards.lp', index=1, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=2717, serialized_end=2936) +_GETALLUNREDEEMEDPARTICIPANTREWARDSRESPONSE = _descriptor.Descriptor(name='GetAllUnredeemedParticipantRewardsResponse', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='tracks', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.tracks', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='next_page', full_name='eve_public.campaign.api.GetAllUnredeemedParticipantRewardsResponse.next_page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETALLUNREDEEMEDPARTICIPANTREWARDSRESPONSE_TRACKUNREDEEMEDREWARDS], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2521, serialized_end=2936) +_GETLIMITSREQUEST = _descriptor.Descriptor(name='GetLimitsRequest', full_name='eve_public.campaign.api.GetLimitsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2938, serialized_end=2956) +_GETLIMITSRESPONSE = _descriptor.Descriptor(name='GetLimitsResponse', full_name='eve_public.campaign.api.GetLimitsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='max_active_objectives_per_participant', full_name='eve_public.campaign.api.GetLimitsResponse.max_active_objectives_per_participant', index=0, number=1, type=13, cpp_type=3, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=2958, serialized_end=3024) +_GETALLREQUEST = _descriptor.Descriptor(name='GetAllRequest', full_name='eve_public.campaign.api.GetAllRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3026, serialized_end=3045) +_GETALLRESPONSE = _descriptor.Descriptor(name='GetAllResponse', full_name='eve_public.campaign.api.GetAllResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaigns', full_name='eve_public.campaign.api.GetAllResponse.campaigns', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3047, serialized_end=3119) +_GETSTATSREQUEST = _descriptor.Descriptor(name='GetStatsRequest', full_name='eve_public.campaign.api.GetStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetStatsRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3121, serialized_end=3193) +_GETSTATSRESPONSE_OBJECTIVESTATS = _descriptor.Descriptor(name='ObjectiveStats', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetStatsResponse.ObjectiveStats.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3352, serialized_end=3483) +_GETSTATSRESPONSE = _descriptor.Descriptor(name='GetStatsResponse', full_name='eve_public.campaign.api.GetStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign_stats', full_name='eve_public.campaign.api.GetStatsResponse.campaign_stats', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='objective_stats', full_name='eve_public.campaign.api.GetStatsResponse.objective_stats', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETSTATSRESPONSE_OBJECTIVESTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3196, serialized_end=3487) +_GETPARTICIPANTSTATSREQUEST = _descriptor.Descriptor(name='GetParticipantStatsRequest', full_name='eve_public.campaign.api.GetParticipantStatsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='campaign', full_name='eve_public.campaign.api.GetParticipantStatsRequest.campaign', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3489, serialized_end=3572) +_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS = _descriptor.Descriptor(name='ParticipantStats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='stats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.ParticipantStats.stats', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3705, serialized_end=3849) +_GETPARTICIPANTSTATSRESPONSE = _descriptor.Descriptor(name='GetParticipantStatsResponse', full_name='eve_public.campaign.api.GetParticipantStatsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='participant_stats', full_name='eve_public.campaign.api.GetParticipantStatsResponse.participant_stats', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETPARTICIPANTSTATSRESPONSE_PARTICIPANTSTATS], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3575, serialized_end=3853) +_GETALLUNREDEEMEDREWARDSREQUEST = _descriptor.Descriptor(name='GetAllUnredeemedRewardsRequest', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsRequest', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='page', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsRequest.page', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3855, serialized_end=3923) _GETALLUNREDEEMEDREWARDSRESPONSE_OBJECTIVE = _descriptor.Descriptor(name='Objective', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objective', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.objective', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='isk_intervals_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.isk_intervals_unredeemed', index=1, number=2, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='no_isk_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.no_isk_unredeemed', index=2, number=3, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='lp_intervals_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.lp_intervals_unredeemed', index=3, number=4, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='no_lp_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.no_lp_unredeemed', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='isk', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.isk', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[]), _descriptor.OneofDescriptor(name='lp', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.lp', index=1, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=4083, serialized_end=4297) -_GETALLUNREDEEMEDREWARDSRESPONSE = _descriptor.Descriptor(name='GetAllUnredeemedRewardsResponse', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objectives', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.objectives', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='next_page', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.next_page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETALLUNREDEEMEDREWARDSRESPONSE_OBJECTIVE], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3918, serialized_end=4301) + _descriptor.FieldDescriptor(name='no_lp_unredeemed', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.no_lp_unredeemed', index=4, number=5, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='isk', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.isk', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[]), _descriptor.OneofDescriptor(name='lp', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.Objective.lp', index=1, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=4091, serialized_end=4305) +_GETALLUNREDEEMEDREWARDSRESPONSE = _descriptor.Descriptor(name='GetAllUnredeemedRewardsResponse', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='objectives', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.objectives', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='next_page', full_name='eve_public.campaign.api.GetAllUnredeemedRewardsResponse.next_page', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_GETALLUNREDEEMEDREWARDSRESPONSE_OBJECTIVE], enum_types=[], serialized_options='\x18\x01', is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=3926, serialized_end=4309) _GETALLFORNAMESPACEREQUEST.fields_by_name['namespace'].message_type = eve__public_dot_campaign_dot_campaign__pb2._NAMESPACE _GETALLFORNAMESPACERESPONSE_UPCOMING.fields_by_name['ui'].message_type = eve__public_dot_campaign_dot_ui_dot_ui__pb2._DEFINITION _GETALLFORNAMESPACERESPONSE_UPCOMING.fields_by_name['scheduled_start_time'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP @@ -85,10 +85,10 @@ _GETRESPONSE_RESTRICTEDOBJECTIVE.fields_by_name['career'].enum_type = eve__publi _GETRESPONSE_RESTRICTEDOBJECTIVE.fields_by_name['contribution_method'].message_type = eve__public_dot_campaign_dot_contributionmethod_dot_definition_dot_definition__pb2._IDENTIFIER _GETRESPONSE_RESTRICTEDOBJECTIVE.containing_type = _GETRESPONSE _GETRESPONSE.fields_by_name['attributes'].message_type = eve__public_dot_campaign_dot_campaign__pb2._ATTRIBUTES -_GETRESPONSE.fields_by_name['stats'].message_type = eve__public_dot_campaign_dot_campaign__pb2._STATS _GETRESPONSE.fields_by_name['tracks'].message_type = _GETRESPONSE_TRACK _GETRESPONSE.fields_by_name['objectives'].message_type = eve__public_dot_campaign_dot_objective_dot_objective__pb2._IDENTIFIER _GETRESPONSE.fields_by_name['upcoming_objectives'].message_type = eve__public_dot_campaign_dot_objective_dot_objective__pb2._UPCOMING +_GETRESPONSE.fields_by_name['stats'].message_type = eve__public_dot_campaign_dot_campaign__pb2._STATS _GETRESPONSE.fields_by_name['available_objectives'].message_type = _GETRESPONSE_AVAILABLEOBJECTIVE _GETRESPONSE.fields_by_name['restricted_objectives'].message_type = _GETRESPONSE_RESTRICTEDOBJECTIVE _GETSTATUSREQUEST.fields_by_name['campaign'].message_type = eve__public_dot_campaign_dot_campaign__pb2._IDENTIFIER @@ -239,8 +239,10 @@ GetAllUnredeemedRewardsResponse = _reflection.GeneratedProtocolMessageType('GetA _sym_db.RegisterMessage(GetAllUnredeemedRewardsResponse) _sym_db.RegisterMessage(GetAllUnredeemedRewardsResponse.Objective) DESCRIPTOR._options = None +_GETRESPONSE_TRACK.fields_by_name['stats']._options = None _GETRESPONSE_AVAILABLEOBJECTIVE._options = None _GETRESPONSE_RESTRICTEDOBJECTIVE._options = None +_GETRESPONSE.fields_by_name['stats']._options = None _GETRESPONSE.fields_by_name['available_objectives']._options = None _GETRESPONSE.fields_by_name['restricted_objectives']._options = None _GETALLREQUEST._options = None diff --git a/eveProto/generated/eve_public/campaign/parameter/parameter_pb2.py b/eveProto/generated/eve_public/campaign/parameter/parameter_pb2.py @@ -5,7 +5,7 @@ from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() from eveProto.generated.eve_public.campaign.ui import ui_pb2 as eve__public_dot_campaign_dot_ui_dot_ui__pb2 -DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/parameter/parameter.proto', package='eve_public.campaign.parameter', syntax='proto3', serialized_options='ZHgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/parameter', create_key=_descriptor._internal_create_key, serialized_pb='\n-eve_public/campaign/parameter/parameter.proto\x12\x1deve_public.campaign.parameter\x1a\x1feve_public/campaign/ui/ui.proto"\xe3\x03\n\nDefinition\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x02ui\x18\x02 \x01(\x0b2".eve_public.campaign.ui.Definition\x12V\n\x0csingle_value\x18\x03 \x01(\x0b2>.eve_public.campaign.parameter.Definition.SingleValueParameterH\x00\x12E\n\x03set\x18\x04 \x01(\x0b26.eve_public.campaign.parameter.Definition.SetParameterH\x00\x12d\n\x14multi_value_type_set\x18\x05 \x01(\x0b2D.eve_public.campaign.parameter.Definition.MultiValueTypeSetParameterH\x00\x1a*\n\x14SingleValueParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a"\n\x0cSetParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a:\n\x1aMultiValueTypeSetParameter\x12\x1c\n\x14accepted_value_types\x18\x01 \x03(\tB\x07\n\x05class"\x92\x05\n\rConfiguration\x12\x0b\n\x03key\x18\x01 \x01(\t\x12P\n\x0csingle_value\x18\x03 \x01(\x0b28.eve_public.campaign.parameter.Configuration.SingleValueH\x00\x12J\n\tset_value\x18\x04 \x01(\x0b25.eve_public.campaign.parameter.Configuration.SetValueH\x00\x12i\n\x1amulti_value_type_set_value\x18\x05 \x01(\x0b2C.eve_public.campaign.parameter.Configuration.MultiValueTypeSetValueH\x00\x1a7\n\x05Value\x12\x11\n\x07literal\x18\x01 \x01(\tH\x00\x12\x12\n\x08wildcard\x18\x02 \x01(\x08H\x00B\x07\n\x05value\x1ad\n\x0bSingleValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12A\n\x05value\x18\x02 \x01(\x0b22.eve_public.campaign.parameter.Configuration.Value\x1ab\n\x08SetValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12B\n\x06values\x18\x02 \x03(\x0b22.eve_public.campaign.parameter.Configuration.Value\x1a_\n\x16MultiValueTypeSetValue\x12E\n\x06values\x18\x01 \x03(\x0b25.eve_public.campaign.parameter.Configuration.SetValueB\x07\n\x05classBJZHgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/parameterb\x06proto3', dependencies=[eve__public_dot_campaign_dot_ui_dot_ui__pb2.DESCRIPTOR]) +DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/campaign/parameter/parameter.proto', package='eve_public.campaign.parameter', syntax='proto3', serialized_options='ZHgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/parameter', create_key=_descriptor._internal_create_key, serialized_pb='\n-eve_public/campaign/parameter/parameter.proto\x12\x1deve_public.campaign.parameter\x1a\x1feve_public/campaign/ui/ui.proto"\xe3\x03\n\nDefinition\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x02ui\x18\x02 \x01(\x0b2".eve_public.campaign.ui.Definition\x12V\n\x0csingle_value\x18\x03 \x01(\x0b2>.eve_public.campaign.parameter.Definition.SingleValueParameterH\x00\x12E\n\x03set\x18\x04 \x01(\x0b26.eve_public.campaign.parameter.Definition.SetParameterH\x00\x12d\n\x14multi_value_type_set\x18\x05 \x01(\x0b2D.eve_public.campaign.parameter.Definition.MultiValueTypeSetParameterH\x00\x1a*\n\x14SingleValueParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a"\n\x0cSetParameter\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x1a:\n\x1aMultiValueTypeSetParameter\x12\x1c\n\x14accepted_value_types\x18\x01 \x03(\tB\x07\n\x05class"\x92\x05\n\rConfiguration\x12\x0b\n\x03key\x18\x01 \x01(\t\x12P\n\x0csingle_value\x18\x02 \x01(\x0b28.eve_public.campaign.parameter.Configuration.SingleValueH\x00\x12J\n\tset_value\x18\x03 \x01(\x0b25.eve_public.campaign.parameter.Configuration.SetValueH\x00\x12i\n\x1amulti_value_type_set_value\x18\x04 \x01(\x0b2C.eve_public.campaign.parameter.Configuration.MultiValueTypeSetValueH\x00\x1a7\n\x05Value\x12\x11\n\x07literal\x18\x01 \x01(\tH\x00\x12\x12\n\x08wildcard\x18\x02 \x01(\x08H\x00B\x07\n\x05value\x1ad\n\x0bSingleValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12A\n\x05value\x18\x02 \x01(\x0b22.eve_public.campaign.parameter.Configuration.Value\x1ab\n\x08SetValue\x12\x12\n\nvalue_type\x18\x01 \x01(\t\x12B\n\x06values\x18\x02 \x03(\x0b22.eve_public.campaign.parameter.Configuration.Value\x1a_\n\x16MultiValueTypeSetValue\x12E\n\x06values\x18\x01 \x03(\x0b25.eve_public.campaign.parameter.Configuration.SetValueB\x07\n\x05classBJZHgithub.com/ccpgames/eve-proto-go/generated/eve_public/campaign/parameterb\x06proto3', dependencies=[eve__public_dot_campaign_dot_ui_dot_ui__pb2.DESCRIPTOR]) _DEFINITION_SINGLEVALUEPARAMETER = _descriptor.Descriptor(name='SingleValueParameter', full_name='eve_public.campaign.parameter.Definition.SingleValueParameter', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='value_type', full_name='eve_public.campaign.parameter.Definition.SingleValueParameter.value_type', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=450, serialized_end=492) _DEFINITION_SETPARAMETER = _descriptor.Descriptor(name='SetParameter', full_name='eve_public.campaign.parameter.Definition.SetParameter', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='value_type', full_name='eve_public.campaign.parameter.Definition.SetParameter.value_type', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=494, serialized_end=528) _DEFINITION_MULTIVALUETYPESETPARAMETER = _descriptor.Descriptor(name='MultiValueTypeSetParameter', full_name='eve_public.campaign.parameter.Definition.MultiValueTypeSetParameter', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='accepted_value_types', full_name='eve_public.campaign.parameter.Definition.MultiValueTypeSetParameter.accepted_value_types', index=0, number=1, type=9, cpp_type=9, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=530, serialized_end=588) @@ -19,9 +19,9 @@ _CONFIGURATION_SINGLEVALUE = _descriptor.Descriptor(name='SingleValue', full_nam _CONFIGURATION_SETVALUE = _descriptor.Descriptor(name='SetValue', full_name='eve_public.campaign.parameter.Configuration.SetValue', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='value_type', full_name='eve_public.campaign.parameter.Configuration.SetValue.value_type', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='values', full_name='eve_public.campaign.parameter.Configuration.SetValue.values', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1054, serialized_end=1152) _CONFIGURATION_MULTIVALUETYPESETVALUE = _descriptor.Descriptor(name='MultiValueTypeSetValue', full_name='eve_public.campaign.parameter.Configuration.MultiValueTypeSetValue', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='values', full_name='eve_public.campaign.parameter.Configuration.MultiValueTypeSetValue.values', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=1154, serialized_end=1249) _CONFIGURATION = _descriptor.Descriptor(name='Configuration', full_name='eve_public.campaign.parameter.Configuration', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='key', full_name='eve_public.campaign.parameter.Configuration.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=''.decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='single_value', full_name='eve_public.campaign.parameter.Configuration.single_value', index=1, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='set_value', full_name='eve_public.campaign.parameter.Configuration.set_value', index=2, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor(name='multi_value_type_set_value', full_name='eve_public.campaign.parameter.Configuration.multi_value_type_set_value', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_CONFIGURATION_VALUE, + _descriptor.FieldDescriptor(name='single_value', full_name='eve_public.campaign.parameter.Configuration.single_value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='set_value', full_name='eve_public.campaign.parameter.Configuration.set_value', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='multi_value_type_set_value', full_name='eve_public.campaign.parameter.Configuration.multi_value_type_set_value', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_CONFIGURATION_VALUE, _CONFIGURATION_SINGLEVALUE, _CONFIGURATION_SETVALUE, _CONFIGURATION_MULTIVALUETYPESETVALUE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='class', full_name='eve_public.campaign.parameter.Configuration.class', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=600, serialized_end=1258) diff --git a/eveProto/generated/eve_public/store/targetaudience/offer/price_pb2.py b/eveProto/generated/eve_public/store/targetaudience/offer/price_pb2.py @@ -5,13 +5,13 @@ from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/store/targetaudience/offer/price.proto', package='eve_public.store.targetaudience.offer', syntax='proto3', serialized_options='ZPgithub.com/ccpgames/eve-proto-go/generated/eve_public/store/targetaudience/offer', create_key=_descriptor._internal_create_key, serialized_pb='\n1eve_public/store/targetaudience/offer/price.proto\x12%eve_public.store.targetaudience.offer"m\n\x0fPriceInCurrency\x12A\n\x08currency\x18\x01 \x01(\x0e2/.eve_public.store.targetaudience.offer.Currency\x12\x17\n\x0famount_in_cents\x18\x02 \x01(\x04"$\n\tPlexPrice\x12\x17\n\x0famount_in_cents\x18\x01 \x01(\x04"\x95\x02\n\x05Price\x12\x0e\n\x04free\x18\x01 \x01(\x08H\x00\x12P\n\x10real_money_price\x18\x02 \x01(\x0b24.eve_public.store.targetaudience.offer.Price.PayableH\x00\x12F\n\nplex_price\x18\x03 \x01(\x0b20.eve_public.store.targetaudience.offer.PlexPriceH\x00\x1aQ\n\x07Payable\x12F\n\x06prices\x18\x01 \x03(\x0b26.eve_public.store.targetaudience.offer.PriceInCurrencyB\x0f\n\rprice_details*~\n\x08Currency\x12\x18\n\x14CURRENCY_UNSPECIFIED\x10\x00\x12\x10\n\x0cCURRENCY_EUR\x10\x01\x12\x10\n\x0cCURRENCY_GBP\x10\x02\x12\x10\n\x0cCURRENCY_JPY\x10\x03\x12\x10\n\x0cCURRENCY_RUB\x10\x04\x12\x10\n\x0cCURRENCY_USD\x10\x05BRZPgithub.com/ccpgames/eve-proto-go/generated/eve_public/store/targetaudience/offerb\x06proto3') +DESCRIPTOR = _descriptor.FileDescriptor(name='eve_public/store/targetaudience/offer/price.proto', package='eve_public.store.targetaudience.offer', syntax='proto3', serialized_options='ZPgithub.com/ccpgames/eve-proto-go/generated/eve_public/store/targetaudience/offer', create_key=_descriptor._internal_create_key, serialized_pb='\n1eve_public/store/targetaudience/offer/price.proto\x12%eve_public.store.targetaudience.offer"m\n\x0fPriceInCurrency\x12A\n\x08currency\x18\x01 \x01(\x0e2/.eve_public.store.targetaudience.offer.Currency\x12\x17\n\x0famount_in_cents\x18\x02 \x01(\x04"$\n\tPlexPrice\x12\x17\n\x0famount_in_cents\x18\x01 \x01(\x04"\x9a\x04\n\x05Price\x12\x0e\n\x04free\x18\x01 \x01(\x08H\x00\x12P\n\x10real_money_price\x18\x02 \x01(\x0b24.eve_public.store.targetaudience.offer.Price.PayableH\x00\x12F\n\nplex_price\x18\x03 \x01(\x0b20.eve_public.store.targetaudience.offer.PlexPriceH\x00\x12X\n\x0fcomposite_price\x18\x04 \x01(\x0b2=.eve_public.store.targetaudience.offer.Price.CompositePayableH\x00\x1aQ\n\x07Payable\x12F\n\x06prices\x18\x01 \x03(\x0b26.eve_public.store.targetaudience.offer.PriceInCurrency\x1a\xa8\x01\n\x10CompositePayable\x12N\n\x10real_money_price\x18\x01 \x01(\x0b24.eve_public.store.targetaudience.offer.Price.Payable\x12D\n\nplex_price\x18\x02 \x01(\x0b20.eve_public.store.targetaudience.offer.PlexPriceB\x0f\n\rprice_details*~\n\x08Currency\x12\x18\n\x14CURRENCY_UNSPECIFIED\x10\x00\x12\x10\n\x0cCURRENCY_EUR\x10\x01\x12\x10\n\x0cCURRENCY_GBP\x10\x02\x12\x10\n\x0cCURRENCY_JPY\x10\x03\x12\x10\n\x0cCURRENCY_RUB\x10\x04\x12\x10\n\x0cCURRENCY_USD\x10\x05BRZPgithub.com/ccpgames/eve-proto-go/generated/eve_public/store/targetaudience/offerb\x06proto3') _CURRENCY = _descriptor.EnumDescriptor(name='Currency', full_name='eve_public.store.targetaudience.offer.Currency', filename=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key, values=[_descriptor.EnumValueDescriptor(name='CURRENCY_UNSPECIFIED', index=0, number=0, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_EUR', index=1, number=1, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_GBP', index=2, number=2, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_JPY', index=3, number=3, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), _descriptor.EnumValueDescriptor(name='CURRENCY_RUB', index=4, number=4, serialized_options=None, type=None, create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor(name='CURRENCY_USD', index=5, number=5, serialized_options=None, type=None, create_key=_descriptor._internal_create_key)], containing_type=None, serialized_options=None, serialized_start=521, serialized_end=647) + _descriptor.EnumValueDescriptor(name='CURRENCY_USD', index=5, number=5, serialized_options=None, type=None, create_key=_descriptor._internal_create_key)], containing_type=None, serialized_options=None, serialized_start=782, serialized_end=908) _sym_db.RegisterEnumDescriptor(_CURRENCY) Currency = enum_type_wrapper.EnumTypeWrapper(_CURRENCY) CURRENCY_UNSPECIFIED = 0 @@ -22,19 +22,29 @@ CURRENCY_RUB = 4 CURRENCY_USD = 5 _PRICEINCURRENCY = _descriptor.Descriptor(name='PriceInCurrency', full_name='eve_public.store.targetaudience.offer.PriceInCurrency', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='currency', full_name='eve_public.store.targetaudience.offer.PriceInCurrency.currency', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='amount_in_cents', full_name='eve_public.store.targetaudience.offer.PriceInCurrency.amount_in_cents', index=1, number=2, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=92, serialized_end=201) _PLEXPRICE = _descriptor.Descriptor(name='PlexPrice', full_name='eve_public.store.targetaudience.offer.PlexPrice', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='amount_in_cents', full_name='eve_public.store.targetaudience.offer.PlexPrice.amount_in_cents', index=0, number=1, type=4, cpp_type=4, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=203, serialized_end=239) -_PRICE_PAYABLE = _descriptor.Descriptor(name='Payable', full_name='eve_public.store.targetaudience.offer.Price.Payable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='prices', full_name='eve_public.store.targetaudience.offer.Price.Payable.prices', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=421, serialized_end=502) -_PRICE = _descriptor.Descriptor(name='Price', full_name='eve_public.store.targetaudience.offer.Price', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='free', full_name='eve_public.store.targetaudience.offer.Price.free', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='real_money_price', full_name='eve_public.store.targetaudience.offer.Price.real_money_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='plex_price', full_name='eve_public.store.targetaudience.offer.Price.plex_price', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_PRICE_PAYABLE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='price_details', full_name='eve_public.store.targetaudience.offer.Price.price_details', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=242, serialized_end=519) +_PRICE_PAYABLE = _descriptor.Descriptor(name='Payable', full_name='eve_public.store.targetaudience.offer.Price.Payable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='prices', full_name='eve_public.store.targetaudience.offer.Price.Payable.prices', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=511, serialized_end=592) +_PRICE_COMPOSITEPAYABLE = _descriptor.Descriptor(name='CompositePayable', full_name='eve_public.store.targetaudience.offer.Price.CompositePayable', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='real_money_price', full_name='eve_public.store.targetaudience.offer.Price.CompositePayable.real_money_price', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor(name='plex_price', full_name='eve_public.store.targetaudience.offer.Price.CompositePayable.plex_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[], serialized_start=595, serialized_end=763) +_PRICE = _descriptor.Descriptor(name='Price', full_name='eve_public.store.targetaudience.offer.Price', filename=None, file=DESCRIPTOR, containing_type=None, create_key=_descriptor._internal_create_key, fields=[_descriptor.FieldDescriptor(name='free', full_name='eve_public.store.targetaudience.offer.Price.free', index=0, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='real_money_price', full_name='eve_public.store.targetaudience.offer.Price.real_money_price', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='plex_price', full_name='eve_public.store.targetaudience.offer.Price.plex_price', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor(name='composite_price', full_name='eve_public.store.targetaudience.offer.Price.composite_price', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key)], extensions=[], nested_types=[_PRICE_PAYABLE, _PRICE_COMPOSITEPAYABLE], enum_types=[], serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], oneofs=[_descriptor.OneofDescriptor(name='price_details', full_name='eve_public.store.targetaudience.offer.Price.price_details', index=0, containing_type=None, create_key=_descriptor._internal_create_key, fields=[])], serialized_start=242, serialized_end=780) _PRICEINCURRENCY.fields_by_name['currency'].enum_type = _CURRENCY _PRICE_PAYABLE.fields_by_name['prices'].message_type = _PRICEINCURRENCY _PRICE_PAYABLE.containing_type = _PRICE +_PRICE_COMPOSITEPAYABLE.fields_by_name['real_money_price'].message_type = _PRICE_PAYABLE +_PRICE_COMPOSITEPAYABLE.fields_by_name['plex_price'].message_type = _PLEXPRICE +_PRICE_COMPOSITEPAYABLE.containing_type = _PRICE _PRICE.fields_by_name['real_money_price'].message_type = _PRICE_PAYABLE _PRICE.fields_by_name['plex_price'].message_type = _PLEXPRICE +_PRICE.fields_by_name['composite_price'].message_type = _PRICE_COMPOSITEPAYABLE _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['free']) _PRICE.fields_by_name['free'].containing_oneof = _PRICE.oneofs_by_name['price_details'] _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['real_money_price']) _PRICE.fields_by_name['real_money_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] _PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['plex_price']) _PRICE.fields_by_name['plex_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] +_PRICE.oneofs_by_name['price_details'].fields.append(_PRICE.fields_by_name['composite_price']) +_PRICE.fields_by_name['composite_price'].containing_oneof = _PRICE.oneofs_by_name['price_details'] DESCRIPTOR.message_types_by_name['PriceInCurrency'] = _PRICEINCURRENCY DESCRIPTOR.message_types_by_name['PlexPrice'] = _PLEXPRICE DESCRIPTOR.message_types_by_name['Price'] = _PRICE @@ -48,8 +58,11 @@ PlexPrice = _reflection.GeneratedProtocolMessageType('PlexPrice', (_message.Mess _sym_db.RegisterMessage(PlexPrice) Price = _reflection.GeneratedProtocolMessageType('Price', (_message.Message,), {'Payable': _reflection.GeneratedProtocolMessageType('Payable', (_message.Message,), {'DESCRIPTOR': _PRICE_PAYABLE, '__module__': 'eve_public.store.targetaudience.offer.price_pb2'}), + 'CompositePayable': _reflection.GeneratedProtocolMessageType('CompositePayable', (_message.Message,), {'DESCRIPTOR': _PRICE_COMPOSITEPAYABLE, + '__module__': 'eve_public.store.targetaudience.offer.price_pb2'}), 'DESCRIPTOR': _PRICE, '__module__': 'eve_public.store.targetaudience.offer.price_pb2'}) _sym_db.RegisterMessage(Price) _sym_db.RegisterMessage(Price.Payable) +_sym_db.RegisterMessage(Price.CompositePayable) DESCRIPTOR._options = None diff --git a/evegraphics/spaceSubway/spaceSubwayEffect.py b/evegraphics/spaceSubway/spaceSubwayEffect.py @@ -93,13 +93,16 @@ class SpaceSubwayCamera(object): newPoi = poi.GetValue() if poi else self.pointOfInterest with ExceptionEater('Got error while updating camera'): if newPos != (0, 0, 0) and newPoi != (0, 0, 0) and newPos != newPoi: - self.position = newPos - self.pointOfInterest = newPoi + self.SetPositionAndPointOfInterest(newPos, newPoi) self.fov = fov.GetValue() if fov else self.fov uthread2.Yield() log.info('Stopped updating jump camera') + def SetPositionAndPointOfInterest(self, newPos, newPoi): + self.position = newPos + self.pointOfInterest = newPoi + def UnLink(self): self.isUpdating = False diff --git a/jobboard/client/features/campaigns/home_page_section.py b/jobboard/client/features/campaigns/home_page_section.py @@ -169,7 +169,7 @@ class CampaignSectionController(object): campaign_controllers_by_id = {} campaigns_card_controllers_by_id = {} current_campaigns_by_id = self.repository.get_data_for_all_current_campaigns() - for c_id, campaign in current_campaigns_by_id.iteritems(): + for c_id, campaign in current_campaigns_by_id.items(): campaign_controller = CampaignController(campaign, self.repository) campaign_controllers_by_id[c_id] = campaign_controller controller = CampaignCardController(campaign_controller) @@ -182,7 +182,7 @@ class CampaignSectionController(object): def get_campaign_card_controllers(self): current_set = CURRENT_CAMPAIGN_SET ret = [] - for card_controller in self.campaigns_card_controllers_by_id.itervalues(): + for card_controller in self.campaigns_card_controllers_by_id.values(): if card_controller.campaign_controller.campaign_set_name != current_set: continue if card_controller.is_expired: diff --git a/jobboard/client/features/campaigns/qa_tools.py b/jobboard/client/features/campaigns/qa_tools.py @@ -1,6 +1,8 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\jobboard\client\features\campaigns\qa_tools.py import blue from campaigns.client.v1.data_model.objective import ObjectiveID +from monolithsentry.client.error_spike_key_consts import CAMPAIGNS_OBJECTIVE_GET_STATS_TIMEOUT +from monolithsentry.client.local_error_spike_report import DEFAULT_ERROR_THRESHOLD, DEFAULT_ERROR_TTL_SECONDS, record_handled_failure from carbon.common.script.sys.serviceConst import ROLE_GML, ROLE_WORLDMOD from carbon.common.script.sys.serviceManager import ServiceManager from carbonui.control.contextMenu.menuData import MenuData @@ -31,10 +33,15 @@ def get_qa_menu_for_job(job): MenuEntryData('10', func=lambda : _add_objective_progress(job.objective_id, 10)), MenuEntryData('100', func=lambda : _add_objective_progress(job.objective_id, 100)), MenuEntryData('1000', func=lambda : _add_objective_progress(job.objective_id, 1000)), - MenuEntryData('copy slash cmd', func=lambda : blue.pyos.SetClipboardData('/communitycampaign add_objective_progress %s' % objective_id))])]) + MenuEntryData('copy slash cmd', func=lambda : blue.pyos.SetClipboardData('/communitycampaign add_objective_progress %s' % objective_id))]), + MenuEntryData('Simulate objective stats timeout spike (Sentry after %s in %ss)' % (DEFAULT_ERROR_THRESHOLD, DEFAULT_ERROR_TTL_SECONDS), func=lambda : _simulate_objective_stats_timeout_spike(job.objective_id))]) return m +def _simulate_objective_stats_timeout_spike(objective_id): + record_handled_failure(CAMPAIGNS_OBJECTIVE_GET_STATS_TIMEOUT, 'QA simulate objective stats poll timed out: %s' % objective_id) + + def _add_objective_progress(objective_id, progress_amount): slash = ServiceManager.Instance().GetService('slash') (slash.SlashCmd(u'/communitycampaign add_objective_progress {objective_id} {progress_amount}'.format(objective_id=unicode(objective_id.uuid), progress_amount=progress_amount)),) diff --git a/monolithsentry/client/error_spike_key_consts.py b/monolithsentry/client/error_spike_key_consts.py @@ -0,0 +1,4 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\monolithsentry\client\error_spike_key_consts.py +CAMPAIGNS_OBJECTIVE_GET_STATS_TIMEOUT = 'campaigns.objective_get_stats.timeout' +FLATBUFFER_GET_UPDATE_TIMEOUT = 'flatbuffer.get_update.service_unavailable' +FLATBUFFER_GET_UPDATE_CONNECTION_RESET = 'flatbuffer.get_update.connection_reset' diff --git a/monolithsentry/client/local_error_spike_report.py b/monolithsentry/client/local_error_spike_report.py @@ -0,0 +1,32 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\monolithsentry\client\local_error_spike_report.py +import logging, blue, monolithsentry +from carbon.common.lib.const import SEC +logger = logging.getLogger('monolithsentry.local_spike') +_error_record = {} +DEFAULT_ERROR_THRESHOLD = 5 +DEFAULT_ERROR_TTL_SECONDS = 300 +DEFAULT_SENTRY_COOLDOWN_SECONDS = 600 + +def record_handled_failure(error_key, message, threshold = DEFAULT_ERROR_THRESHOLD, error_ttl = DEFAULT_ERROR_TTL_SECONDS, sentry_cooldown = DEFAULT_SENTRY_COOLDOWN_SECONDS): + current_time = blue.os.GetWallclockTime() + last_error_time, count, last_sentry_report_time = _error_record.get(error_key, (current_time, 0, 0)) + elapsed_seconds = (current_time - last_error_time) / SEC + if elapsed_seconds > error_ttl: + count = 0 + count += 1 + last_error_time = current_time + _error_record[error_key] = (last_error_time, count, last_sentry_report_time) + if count <= threshold: + return + elapsed_sentry_seconds = (current_time - last_sentry_report_time) / SEC + if last_sentry_report_time and elapsed_sentry_seconds < sentry_cooldown: + return + sentry_message = '%s - local client error spike: key=%s count=%s within %ss (threshold=%s)' % (message, + error_key, + count, + error_ttl, + threshold) + monolithsentry.capture_error(sentry_message, extra={'error_key': error_key, + 'error_count': count, + 'error_ttl': error_ttl}, new_tags={'client_error_key': error_key}) + _error_record[error_key] = (current_time, 0, current_time) diff --git a/monolithsentry/environment.py b/monolithsentry/environment.py @@ -15,6 +15,8 @@ def get_server_environment(): return 'localhost' if '@' in cluster_name: return 'localhost' + if 'integration-test' in cluster_name: + return 'eve-integration-test' return cluster_name.lower() diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc Binary files differ. diff --git a/nodegraph/client/actions/other.py b/nodegraph/client/actions/other.py @@ -1,4 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\nodegraph\client\actions\other.py +from victoriametrics.metrics_reporter import send_metrics_to_victoria_metrics from .base import Action class Screenshot(Action): @@ -13,3 +14,18 @@ class Screenshot(Action): super(Screenshot, self).start(**kwargs) from carbonui.uicore import uicore uicore.commandHandler.PrintScreen(self.directory, self.file_name) + + +class SendMetricsToVictoriaMetrics(Action): + atom_id = 728 + + def __init__(self, metric_prefix = 'nodegraph_', metrics = None, measurement_name = None, victoria_metrics_base_url = None, **kwargs): + super(SendMetricsToVictoriaMetrics, self).__init__(**kwargs) + self.metric_prefix = metric_prefix + self.metrics = metrics + self.measurement_name = measurement_name + self.victoria_metrics_base_url = victoria_metrics_base_url + + def start(self, **kwargs): + super(SendMetricsToVictoriaMetrics, self).start(**kwargs) + send_metrics_to_victoria_metrics(self.metrics, base_url=self.victoria_metrics_base_url, metric_prefix=self.metric_prefix, measurement_name=self.measurement_name) diff --git a/nodegraph/client/getters/class_registry.py b/nodegraph/client/getters/class_registry.py @@ -19,6 +19,7 @@ from .module import * from .npc import * from .object import * from .other import * +from .performance import * from .skill import * from .skin import * from .space_component import * diff --git a/nodegraph/client/getters/performance.py b/nodegraph/client/getters/performance.py @@ -0,0 +1,24 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\nodegraph\client\getters\performance.py +from performancemetrics.client.metrics_fetcher import get_client_performance_metrics, get_server_performance_metrics +from .base import GetterAtom + +class GetClientPerformanceMetrics(GetterAtom): + atom_id = 727 + + def __init__(self, duration = 10): + self.duration = duration + + def get_values(self, **kwargs): + metrics = get_client_performance_metrics(self.duration) + return {'metrics': metrics} + + +class GetServerPerformanceMetrics(GetterAtom): + atom_id = 751 + + def __init__(self, duration = 10): + self.duration = duration + + def get_values(self, **kwargs): + metrics = get_server_performance_metrics(self.duration) + return {'metrics': metrics} diff --git a/performancemetrics/__init__.py b/performancemetrics/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\performancemetrics\__init__.py +pass diff --git a/performancemetrics/client/__init__.py b/performancemetrics/client/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\performancemetrics\client\__init__.py +pass diff --git a/performancemetrics/client/metrics_fetcher.py b/performancemetrics/client/metrics_fetcher.py @@ -0,0 +1,16 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\performancemetrics\client\metrics_fetcher.py +from __future__ import division, print_function +from carbon.common.script.sys.serviceConst import ROLE_QA +from carbon.common.script.sys.serviceManager import ServiceManager +from performancemetrics.common.metrics_calculator import calculate_average_stats + +def get_client_performance_metrics(duration): + return calculate_average_stats(duration) + + +def get_server_performance_metrics(duration): + sm = ServiceManager.Instance() + if not session.role & ROLE_QA: + return + metrics = sm.RemoteSvc('performanceMetricsService').get_performance_metrics(duration=duration) + return metrics diff --git a/performancemetrics/common/__init__.py b/performancemetrics/common/__init__.py @@ -0,0 +1,2 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\performancemetrics\common\__init__.py +pass diff --git a/performancemetrics/common/metrics_calculator.py b/performancemetrics/common/metrics_calculator.py @@ -0,0 +1,25 @@ +#Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\performancemetrics\common\metrics_calculator.py +from __future__ import division, print_function +import blue +_AVERAGED_SAMPLE_ATTRIBUTES = (('fps', 'fps'), + ('cpu_usage', 'userProcessCpuUsage'), + ('memory_python', 'pythonMemoryUsage'), + ('memory_virtual', 'virtualMemory'), + ('memory_workingset', 'workingSetSize')) + +def _mean(values): + if len(values) > 0: + return sum(values) / len(values) + else: + return 0 + + +def calculate_average_stats(duration): + samples = blue.pyos.cpuUsage[-int(duration):] + results = {stat_name:_mean([ getattr(sample, attribute) for sample in samples ]) for stat_name, attribute in _AVERAGED_SAMPLE_ATTRIBUTES} + results['cpu_usage'] = results['cpu_usage'] / 100000000.0 + return results + + +def current_cpu_user_time(): + return blue.sysinfo.GetProcessTimes().userTime diff --git a/victoriametrics/metrics_reporter.py b/victoriametrics/metrics_reporter.py @@ -73,13 +73,15 @@ def _send_metrics_wrapper(url, payload): _send_metrics(url, payload) -def send_metrics_to_victoria_metrics(results, base_url = None, branch_name = None, machine_type = 'manual', metric_prefix = 'undefined_test_', measurement_name = None): +def send_metrics_to_victoria_metrics(results, base_url = None, branch_name = None, machine_type = None, metric_prefix = 'undefined_test_', measurement_name = None): if base_url is None: base_url = VICTORIA_METRICS_BASE_URL if branch_name is None: branch_name = 'EVE-' + os.getenv('TC_EVE_BRANCH_SHORTNAME', 'UNKNOWN') if branch_name is None: branch_name = 'UNKNOWN' + if machine_type is None: + machine_type = os.getenv('TC_TEST_MACHINE_TYPE', 'manual') url_format, payload = _format_url_and_payload(results, branch_name, machine_type, metric_prefix, measurement_name) url = base_url + url_format _send_metrics_wrapper(url, payload)